From c3313fda31c049b67dcbff6501743254a4075f6a Mon Sep 17 00:00:00 2001
From: Zakru <23387227+Zakru@users.noreply.github.com>
Date: Fri, 21 Jul 2023 23:09:29 +0300
Subject: [PATCH 1/9] Add spatial audio effects

Replace `bevy_audio` with `bevy_kira_audio`.

Sounds are unedited/derived from CC0 sounds from FreeSound.org.

Works towards #394, although many vital effects are still missing.
---
 .gitattributes                           |   1 +
 Cargo.lock                               | 132 +++++++++++++++++++----
 Cargo.toml                               |  29 ++++-
 assets/audio/sounds/construct.ogg        |   3 +
 assets/audio/sounds/destruction.ogg      |   3 +
 assets/audio/sounds/manufacture.ogg      |   3 +
 crates/audio/Cargo.toml                  |   2 +
 crates/audio/src/lib.rs                  |   6 +-
 crates/audio/src/music.rs                |  16 +--
 crates/audio/src/spatial.rs              | 128 ++++++++++++++++++++++
 crates/camera/src/camera.rs              |   6 +-
 crates/camera/src/lib.rs                 |   4 +-
 crates/construction/Cargo.toml           |   3 +
 crates/construction/src/manufacturing.rs |  32 +++++-
 crates/controller/Cargo.toml             |   3 +
 crates/controller/src/draft.rs           |  31 +++++-
 crates/spawner/Cargo.toml                |   3 +
 crates/spawner/src/destroyer.rs          |  75 +++++++++++--
 src/main.rs                              |   2 +
 19 files changed, 435 insertions(+), 47 deletions(-)
 create mode 100644 assets/audio/sounds/construct.ogg
 create mode 100644 assets/audio/sounds/destruction.ogg
 create mode 100644 assets/audio/sounds/manufacture.ogg
 create mode 100644 crates/audio/src/spatial.rs

diff --git a/.gitattributes b/.gitattributes
index f872481a..a725c82c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,5 @@
 assets/audio/**/*.mp3 filter=lfs diff=lfs merge=lfs -text
+assets/audio/**/*.ogg filter=lfs diff=lfs merge=lfs -text
 assets/fonts/**/*.ttf filter=lfs diff=lfs merge=lfs -text
 assets/maps/* filter=lfs diff=lfs merge=lfs -text
 assets/models/* filter=lfs diff=lfs merge=lfs -text
diff --git a/Cargo.lock b/Cargo.lock
index 6df570b7..8f214253 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -669,6 +669,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "atomic-arena"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5450eca8ce5abcfd5520727e975ebab30ccca96030550406b0ca718b224ead10"
+
 [[package]]
 name = "atomic-polyfill"
 version = "0.1.11"
@@ -1045,6 +1051,19 @@ dependencies = [
  "bevy_winit",
 ]
 
+[[package]]
+name = "bevy_kira_audio"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "468257f6c7980d847aba0e9b6c9e4ff4045598510637d6e484b5f290c00a1f92"
+dependencies = [
+ "anyhow",
+ "bevy",
+ "kira",
+ "parking_lot 0.12.1",
+ "thiserror",
+]
+
 [[package]]
 name = "bevy_log"
 version = "0.10.1"
@@ -2095,6 +2114,8 @@ name = "de_audio"
 version = "0.1.0-dev"
 dependencies = [
  "bevy",
+ "bevy_kira_audio",
+ "de_camera",
  "de_conf",
  "de_core",
  "iyes_progress",
@@ -2188,12 +2209,15 @@ version = "0.1.0-dev"
 dependencies = [
  "ahash 0.7.6",
  "bevy",
+ "bevy_kira_audio",
+ "de_audio",
  "de_core",
  "de_index",
  "de_objects",
  "de_pathing",
  "de_signs",
  "de_spawner",
+ "iyes_progress",
  "parry2d",
  "parry3d",
 ]
@@ -2204,6 +2228,8 @@ version = "0.1.0-dev"
 dependencies = [
  "ahash 0.7.6",
  "bevy",
+ "bevy_kira_audio",
+ "de_audio",
  "de_behaviour",
  "de_camera",
  "de_combat",
@@ -2221,6 +2247,7 @@ dependencies = [
  "de_terrain",
  "enum-map",
  "glam",
+ "iyes_progress",
  "parry2d",
  "parry3d",
 ]
@@ -2255,6 +2282,7 @@ name = "de_game"
 version = "0.1.0-dev"
 dependencies = [
  "bevy",
+ "bevy_kira_audio",
  "de_audio",
  "de_behaviour",
  "de_camera",
@@ -2517,12 +2545,15 @@ version = "0.1.0-dev"
 dependencies = [
  "ahash 0.7.6",
  "bevy",
+ "bevy_kira_audio",
+ "de_audio",
  "de_core",
  "de_energy",
  "de_index",
  "de_map",
  "de_objects",
  "de_terrain",
+ "iyes_progress",
  "parry2d",
  "parry3d",
 ]
@@ -3707,6 +3738,18 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "kira"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e53aef6f6ec851da68a0ad6d6283bd99ea1a9164f38fd7ac353e28ccd6f5cda"
+dependencies = [
+ "atomic-arena",
+ "cpal",
+ "ringbuf",
+ "symphonia",
+]
+
 [[package]]
 name = "kqueue"
 version = "1.0.7"
@@ -3763,17 +3806,6 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
-[[package]]
-name = "lewton"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030"
-dependencies = [
- "byteorder",
- "ogg",
- "tinyvec",
-]
-
 [[package]]
 name = "libc"
 version = "0.2.147"
@@ -4368,15 +4400,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "ogg"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.18.0"
@@ -5020,6 +5043,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "ringbuf"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79abed428d1fd2a128201cec72c5f6938e2da607c6f3745f769fabea399d950a"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "robust"
 version = "0.2.3"
@@ -5033,8 +5065,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bdf1d4dea18dff2e9eb6dca123724f8b60ef44ad74a9ad283cdfe025df7e73fa"
 dependencies = [
  "cpal",
- "lewton",
- "symphonia",
 ]
 
 [[package]]
@@ -5588,7 +5618,11 @@ checksum = "62e48dba70095f265fdb269b99619b95d04c89e619538138383e63310b14d941"
 dependencies = [
  "lazy_static",
  "symphonia-bundle-mp3",
+ "symphonia-codec-pcm",
+ "symphonia-codec-vorbis",
  "symphonia-core",
+ "symphonia-format-ogg",
+ "symphonia-format-wav",
  "symphonia-metadata",
 ]
 
@@ -5605,6 +5639,27 @@ dependencies = [
  "symphonia-metadata",
 ]
 
+[[package]]
+name = "symphonia-codec-pcm"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47f1fbd220a06a641c8ce2ddad10f5ef6ee5cc0c54d9044d25d43b0d3119deaa"
+dependencies = [
+ "log",
+ "symphonia-core",
+]
+
+[[package]]
+name = "symphonia-codec-vorbis"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3953397e3506aa01350c4205817e4f95b58d476877a42f0458d07b665749e203"
+dependencies = [
+ "log",
+ "symphonia-core",
+ "symphonia-utils-xiph",
+]
+
 [[package]]
 name = "symphonia-core"
 version = "0.5.3"
@@ -5618,6 +5673,29 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "symphonia-format-ogg"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bf1a00ccd11452d44048a0368828040f778ae650418dbd9d8765b7ee2574c8d"
+dependencies = [
+ "log",
+ "symphonia-core",
+ "symphonia-metadata",
+ "symphonia-utils-xiph",
+]
+
+[[package]]
+name = "symphonia-format-wav"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da76614728fa27c003bdcdfbac51396bd8fcbf94c95fe8e62f1d2bac58ef03a4"
+dependencies = [
+ "log",
+ "symphonia-core",
+ "symphonia-metadata",
+]
+
 [[package]]
 name = "symphonia-metadata"
 version = "0.5.3"
@@ -5630,6 +5708,16 @@ dependencies = [
  "symphonia-core",
 ]
 
+[[package]]
+name = "symphonia-utils-xiph"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a450ca645b80d69aff8b35576cbfdc7f20940b29998202aab910045714c951f8"
+dependencies = [
+ "symphonia-core",
+ "symphonia-metadata",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.109"
diff --git a/Cargo.toml b/Cargo.toml
index fad181f3..891511f0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,6 +56,7 @@ de_terrain.workspace = true
 
 # Other
 bevy.workspace = true
+bevy_kira_audio.workspace = true
 tracing.workspace = true
 
 [workspace]
@@ -111,7 +112,7 @@ assert_cmd = "2.0.10"
 async-compat = "0.2.1"
 async-std = "1.11"
 async-tar = "0.4.2"
-bevy = { version = "0.10", features = ["mp3"] }
+bevy_kira_audio = { version = "0.15.0", features = ["mp3", "wav"] }
 bincode = "2.0.0-rc.3"
 chrono = "0.4.24"
 clap = { version = "4.0", features = ["derive"] }
@@ -154,3 +155,29 @@ tracing-subscriber = { version = "0.3.17", features = ["json"] }
 trybuild = "1.0.80"
 url = { version = "2.3.1", features = ["serde"] }
 urlencoding = "2.1.2"
+
+[workspace.dependencies.bevy]
+version = "0.10"
+default-features = false
+features = [
+    "animation",
+    "bevy_asset",
+    "bevy_gilrs",
+    "bevy_scene",
+    "bevy_winit",
+    "bevy_core_pipeline",
+    "bevy_pbr",
+    "bevy_gltf",
+    "bevy_render",
+    "bevy_sprite",
+    "bevy_text",
+    "bevy_ui",
+    "png",
+    "hdr",
+    "ktx2",
+    "zstd",
+    "x11",
+    "filesystem_watcher",
+    "android_shared_stdcxx",
+    "tonemapping_luts"
+]
diff --git a/assets/audio/sounds/construct.ogg b/assets/audio/sounds/construct.ogg
new file mode 100644
index 00000000..cb0ab916
--- /dev/null
+++ b/assets/audio/sounds/construct.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ff3c63efcbee88d0a1dc2beb0f69dd54c43f23ac7e86377471b7974ef450353
+size 79121
diff --git a/assets/audio/sounds/destruction.ogg b/assets/audio/sounds/destruction.ogg
new file mode 100644
index 00000000..360368da
--- /dev/null
+++ b/assets/audio/sounds/destruction.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a2db392df94fa3d31a8649339ec2f1454177582fd704b185c2d1061e5aefa72
+size 164193
diff --git a/assets/audio/sounds/manufacture.ogg b/assets/audio/sounds/manufacture.ogg
new file mode 100644
index 00000000..77db5630
--- /dev/null
+++ b/assets/audio/sounds/manufacture.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0fc7b0e1b41ec37ef9d136f8f0c376ff9d806ccfac1e36c3ef5d2cac2a5fa1f9
+size 50650
diff --git a/crates/audio/Cargo.toml b/crates/audio/Cargo.toml
index 7fa6c924..8eaedd6b 100644
--- a/crates/audio/Cargo.toml
+++ b/crates/audio/Cargo.toml
@@ -13,9 +13,11 @@ categories.workspace = true
 
 [dependencies]
 # DE
+de_camera.workspace = true
 de_conf.workspace = true
 de_core.workspace = true
 
 # Other
 bevy.workspace = true
+bevy_kira_audio.workspace = true
 iyes_progress.workspace = true
diff --git a/crates/audio/src/lib.rs b/crates/audio/src/lib.rs
index e66d7d03..8e6a53ed 100644
--- a/crates/audio/src/lib.rs
+++ b/crates/audio/src/lib.rs
@@ -1,13 +1,17 @@
 use bevy::{app::PluginGroupBuilder, prelude::PluginGroup};
 
 use crate::music::MusicPlugin;
+use crate::spatial::SpatialSoundPlugin;
 
 mod music;
+pub mod spatial;
 
 pub struct AudioPluginGroup;
 
 impl PluginGroup for AudioPluginGroup {
     fn build(self) -> PluginGroupBuilder {
-        PluginGroupBuilder::start::<Self>().add(MusicPlugin)
+        PluginGroupBuilder::start::<Self>()
+            .add(MusicPlugin)
+            .add(SpatialSoundPlugin)
     }
 }
diff --git a/crates/audio/src/music.rs b/crates/audio/src/music.rs
index 7c0d3044..d62c2888 100644
--- a/crates/audio/src/music.rs
+++ b/crates/audio/src/music.rs
@@ -1,4 +1,8 @@
 use bevy::{asset::LoadState, prelude::*};
+use bevy_kira_audio::{
+    prelude::{Audio as KAudio, AudioSource as KAudioSource, Volume},
+    AudioControl,
+};
 use de_conf::Configuration;
 use de_core::state::AppState;
 use iyes_progress::prelude::*;
@@ -14,7 +18,7 @@ impl Plugin for MusicPlugin {
 }
 
 #[derive(Resource)]
-struct Tracks(Handle<AudioSource>);
+struct Tracks(Handle<KAudioSource>);
 
 fn setup(mut commands: Commands, server: Res<AssetServer>) {
     commands.insert_resource(Tracks(server.load("audio/music/menu_loop.mp3")));
@@ -28,12 +32,12 @@ fn load(server: Res<AssetServer>, tracks: Res<Tracks>) -> Progress {
     }
 }
 
-fn start(audio: Res<Audio>, tracks: Res<Tracks>, config: Res<Configuration>) {
+fn start(audio: Res<KAudio>, tracks: Res<Tracks>, config: Res<Configuration>) {
     if !config.audio().music_enabled() {
         return;
     }
-    audio.play_with_settings(
-        tracks.0.clone(),
-        PlaybackSettings::LOOP.with_volume(config.audio().music_volume()),
-    );
+    audio
+        .play(tracks.0.clone())
+        .looped()
+        .with_volume(Volume::Amplitude(config.audio().music_volume().into()));
 }
diff --git a/crates/audio/src/spatial.rs b/crates/audio/src/spatial.rs
new file mode 100644
index 00000000..58b4bb0e
--- /dev/null
+++ b/crates/audio/src/spatial.rs
@@ -0,0 +1,128 @@
+use bevy::prelude::*;
+use bevy_kira_audio::{
+    prelude::{Audio as KAudio, AudioSource as KAudioSource},
+    AudioControl, AudioInstance,
+};
+
+use de_camera::CameraFocus;
+use de_core::gamestate::GameState;
+
+pub(crate) struct SpatialSoundPlugin;
+
+impl Plugin for SpatialSoundPlugin {
+    fn build(&self, app: &mut App) {
+        app.add_system(start.run_if(in_state(GameState::Playing)))
+            .add_system(
+                update_spatial
+                    .in_base_set(CoreSet::PostUpdate)
+                    .run_if(in_state(GameState::Playing)),
+            );
+    }
+}
+
+#[derive(Component, Default)]
+pub struct SpatialSound;
+
+#[derive(Component)]
+pub struct Volume(pub f32);
+
+impl Default for Volume {
+    fn default() -> Self {
+        Self(1.)
+    }
+}
+
+trait VolumeOptionExt {
+    fn volume(&self) -> f32;
+}
+
+impl VolumeOptionExt for Option<&Volume> {
+    fn volume(&self) -> f32 {
+        match self {
+            Some(volume) => volume.0,
+            None => 1.,
+        }
+    }
+}
+
+#[derive(Bundle, Default)]
+pub struct SpatialSoundBundle {
+    pub sound: Handle<KAudioSource>,
+    pub spatial_sound: SpatialSound,
+    pub volume: Volume,
+}
+
+fn calculate_volume_and_pan(
+    camera: &GlobalTransform,
+    focus: &CameraFocus,
+    sound: &GlobalTransform,
+) -> (f64, f64) {
+    let cam_right = camera.right();
+    let sound_dir = (sound.translation() - camera.translation()).normalize();
+    let pan = cam_right.dot(sound_dir) * 0.5 + 0.5;
+
+    let distance_from_camera = camera.translation().distance(sound.translation());
+    let camera_zoom_distance = focus.distance().inner();
+    let distance_attenuation =
+        (1.0 - distance_from_camera / (camera_zoom_distance + 32.) + 0.5).clamp(0.0, 1.0);
+    (distance_attenuation as f64, pan as f64)
+}
+
+fn start(
+    mut commands: Commands,
+    starts: Query<
+        (
+            Entity,
+            &Handle<KAudioSource>,
+            &GlobalTransform,
+            Option<&Volume>,
+        ),
+        (With<SpatialSound>, Without<Handle<AudioInstance>>),
+    >,
+    camera: Query<&GlobalTransform, With<Camera>>,
+    focus: Res<CameraFocus>,
+    audio: Res<KAudio>,
+) {
+    let camera = camera.single();
+
+    for (entity, sound, transform, sound_volume) in &starts {
+        let (volume, pan) = calculate_volume_and_pan(camera, &focus, transform);
+        let handle = audio
+            .play(sound.clone())
+            .with_volume(volume * sound_volume.volume() as f64)
+            .with_panning(pan)
+            .handle();
+
+        commands.entity(entity).insert(handle);
+    }
+}
+
+fn update_spatial(
+    mut commands: Commands,
+    spatial_audios: Query<
+        (
+            Entity,
+            &Handle<AudioInstance>,
+            &GlobalTransform,
+            Option<&Volume>,
+        ),
+        With<SpatialSound>,
+    >,
+    camera: Query<&GlobalTransform, With<Camera>>,
+    focus: Res<CameraFocus>,
+    mut audio_instances: ResMut<Assets<AudioInstance>>,
+) {
+    let camera = camera.single();
+
+    for (entity, audio, transform, sound_volume) in &spatial_audios {
+        let Some(audio_instance) = audio_instances.get_mut(audio) else {
+            commands.entity(entity).despawn();
+            continue;
+        };
+
+        let (volume, pan) = calculate_volume_and_pan(camera, &focus, transform);
+
+        audio_instance.set_volume(volume * sound_volume.volume() as f64, default());
+        audio_instance.set_panning(pan, default());
+    }
+}
diff --git a/crates/camera/src/camera.rs b/crates/camera/src/camera.rs
index 00b68dbb..8c51d2ea 100644
--- a/crates/camera/src/camera.rs
+++ b/crates/camera/src/camera.rs
@@ -217,17 +217,17 @@ impl ZoomCameraEvent {
 }
 
 #[derive(Resource)]
-struct CameraFocus {
+pub struct CameraFocus {
     point: Vec3,
     distance: Metre,
 }
 
 impl CameraFocus {
-    fn point(&self) -> Vec3 {
+    pub fn point(&self) -> Vec3 {
         self.point
     }
 
-    fn distance(&self) -> Metre {
+    pub fn distance(&self) -> Metre {
         self.distance
     }
 
diff --git a/crates/camera/src/lib.rs b/crates/camera/src/lib.rs
index 14b35cc9..e654adf0 100644
--- a/crates/camera/src/lib.rs
+++ b/crates/camera/src/lib.rs
@@ -1,8 +1,8 @@
 use bevy::{app::PluginGroupBuilder, prelude::*};
 use camera::CameraPlugin;
 pub use camera::{
-    CameraSet, MoveCameraHorizontallyEvent, MoveFocusEvent, RotateCameraEvent, TiltCameraEvent,
-    ZoomCameraEvent,
+    CameraFocus, CameraSet, MoveCameraHorizontallyEvent, MoveFocusEvent, RotateCameraEvent,
+    TiltCameraEvent, ZoomCameraEvent,
 };
 use distance::DistancePlugin;
 pub use distance::{CameraDistance, DistanceSet};
diff --git a/crates/construction/Cargo.toml b/crates/construction/Cargo.toml
index 23244a03..adefe3ee 100644
--- a/crates/construction/Cargo.toml
+++ b/crates/construction/Cargo.toml
@@ -13,6 +13,7 @@ categories.workspace = true
 
 [dependencies]
 # DE
+de_audio.workspace = true
 de_core.workspace = true
 de_index.workspace = true
 de_objects.workspace = true
@@ -23,5 +24,7 @@ de_spawner.workspace = true
 # Other
 ahash.workspace = true
 bevy.workspace = true
+bevy_kira_audio.workspace = true
+iyes_progress.workspace = true
 parry2d.workspace = true
 parry3d.workspace = true
diff --git a/crates/construction/src/manufacturing.rs b/crates/construction/src/manufacturing.rs
index 856a588c..081ebded 100644
--- a/crates/construction/src/manufacturing.rs
+++ b/crates/construction/src/manufacturing.rs
@@ -1,7 +1,9 @@
 use std::{collections::VecDeque, time::Duration};
 
 use ahash::AHashMap;
-use bevy::prelude::*;
+use bevy::{asset::LoadState, prelude::*};
+use bevy_kira_audio::AudioSource as KAudioSource;
+use de_audio::spatial::{SpatialSoundBundle, Volume};
 use de_core::{
     baseset::GameSet,
     cleanup::DespawnOnGameExit,
@@ -19,6 +21,7 @@ use de_signs::{
     LineLocation, UpdateLineEndEvent, UpdateLineLocationEvent, UpdatePoleLocationEvent,
 };
 use de_spawner::{ObjectCounter, SpawnBundle};
+use iyes_progress::{Progress, ProgressSystem};
 use parry2d::bounding_volume::Aabb;
 use parry3d::math::Isometry;
 
@@ -32,6 +35,8 @@ impl Plugin for ManufacturingPlugin {
         app.add_event::<EnqueueAssemblyEvent>()
             .add_event::<ChangeDeliveryLocationEvent>()
             .add_event::<DeliverEvent>()
+            .add_system(setup.in_schedule(OnEnter(AppState::AppLoading)))
+            .add_system(load.track_progress().run_if(in_state(AppState::AppLoading)))
             .add_system(
                 configure
                     .in_base_set(GameSet::PostUpdate)
@@ -140,6 +145,9 @@ impl DeliverEvent {
     }
 }
 
+#[derive(Resource)]
+struct AssemblySound(Handle<KAudioSource>);
+
 #[derive(Component)]
 struct DeliveryLocation(Vec2);
 
@@ -306,6 +314,18 @@ impl ProductionItem {
     }
 }
 
+fn setup(mut commands: Commands, server: Res<AssetServer>) {
+    commands.insert_resource(AssemblySound(server.load("audio/sounds/manufacture.ogg")));
+}
+
+fn load(server: Res<AssetServer>, sounds: Res<AssemblySound>) -> Progress {
+    match server.get_load_state(&sounds.0) {
+        LoadState::Loaded => true.into(),
+        LoadState::NotLoaded | LoadState::Loading => false.into(),
+        _ => panic!("Unexpected loading state."),
+    }
+}
+
 fn configure(
     mut commands: Commands,
     solids: SolidObjects,
@@ -428,6 +448,7 @@ fn deliver(
     mut deliver_events: EventReader<DeliverEvent>,
     mut path_events: EventWriter<UpdateEntityPath>,
     factories: Query<(&Transform, &ObjectType, &Player, &DeliveryLocation)>,
+    sound: Res<AssemblySound>,
 ) {
     for delivery in deliver_events.iter() {
         info!(
@@ -459,6 +480,15 @@ fn deliver(
                 false,
             ),
         ));
+
+        commands.spawn((
+            TransformBundle::from_transform(Transform::from_translation(spawn_point)),
+            SpatialSoundBundle {
+                sound: sound.0.clone(),
+                volume: Volume(0.4),
+                ..Default::default()
+            },
+        ));
     }
 }
 
diff --git a/crates/controller/Cargo.toml b/crates/controller/Cargo.toml
index db88ef77..7ac7311b 100644
--- a/crates/controller/Cargo.toml
+++ b/crates/controller/Cargo.toml
@@ -13,6 +13,7 @@ categories.workspace = true
 
 [dependencies]
 # DE
+de_audio.workspace = true
 de_behaviour.workspace = true
 de_camera.workspace = true
 de_combat.workspace = true
@@ -32,7 +33,9 @@ de_terrain.workspace = true
 # Other
 ahash.workspace = true
 bevy.workspace = true
+bevy_kira_audio.workspace = true
 enum-map.workspace = true
 glam.workspace = true
+iyes_progress.workspace = true
 parry2d.workspace = true
 parry3d.workspace = true
diff --git a/crates/controller/src/draft.rs b/crates/controller/src/draft.rs
index 46f6eb0a..846fef95 100644
--- a/crates/controller/src/draft.rs
+++ b/crates/controller/src/draft.rs
@@ -1,4 +1,6 @@
-use bevy::prelude::*;
+use bevy::{asset::LoadState, prelude::*};
+use bevy_kira_audio::AudioSource as KAudioSource;
+use de_audio::spatial::SpatialSoundBundle;
 use de_core::{
     baseset::GameSet,
     cleanup::DespawnOnGameExit,
@@ -8,6 +10,7 @@ use de_core::{
     state::AppState,
 };
 use de_spawner::{DraftAllowed, DraftBundle, SpawnBundle};
+use iyes_progress::{Progress, ProgressSystem};
 
 use crate::mouse::{Pointer, PointerSet};
 
@@ -18,6 +21,8 @@ impl Plugin for DraftPlugin {
         app.add_event::<SpawnDraftsEvent>()
             .add_event::<NewDraftEvent>()
             .add_event::<DiscardDraftsEvent>()
+            .add_system(setup.in_schedule(OnEnter(AppState::AppLoading)))
+            .add_system(load.track_progress().run_if(in_state(AppState::AppLoading)))
             .add_system(
                 spawn
                     .in_base_set(GameSet::Input)
@@ -80,10 +85,26 @@ impl NewDraftEvent {
     }
 }
 
+#[derive(Resource)]
+struct ConstructionSound(Handle<KAudioSource>);
+
+fn setup(mut commands: Commands, server: Res<AssetServer>) {
+    commands.insert_resource(ConstructionSound(server.load("audio/sounds/construct.ogg")));
+}
+
+fn load(server: Res<AssetServer>, sound: Res<ConstructionSound>) -> Progress {
+    match server.get_load_state(&sound.0) {
+        LoadState::Loaded => true.into(),
+        LoadState::NotLoaded | LoadState::Loading => false.into(),
+        _ => panic!("Unexpected loading state."),
+    }
+}
+
 fn spawn(
     mut commands: Commands,
     game_config: Res<GameConfig>,
     drafts: Query<(Entity, &Transform, &ObjectType, &DraftAllowed)>,
+    sound: Res<ConstructionSound>,
 ) {
     for (entity, &transform, &object_type, draft) in drafts.iter() {
         if draft.allowed() {
@@ -93,6 +114,14 @@ fn spawn(
                 game_config.locals().playable(),
                 DespawnOnGameExit,
             ));
+
+            commands.spawn((
+                TransformBundle::from_transform(transform),
+                SpatialSoundBundle {
+                    sound: sound.0.clone(),
+                    ..Default::default()
+                },
+            ));
         }
     }
 }
diff --git a/crates/spawner/Cargo.toml b/crates/spawner/Cargo.toml
index 30b4dc6e..47d50111 100644
--- a/crates/spawner/Cargo.toml
+++ b/crates/spawner/Cargo.toml
@@ -16,6 +16,7 @@ godmode = []
 
 [dependencies]
 # DE
+de_audio.workspace = true
 de_core.workspace = true
 de_index.workspace = true
 de_map.workspace = true
@@ -26,5 +27,7 @@ de_energy.workspace = true
 # Other
 ahash.workspace = true
 bevy.workspace = true
+bevy_kira_audio.workspace = true
+iyes_progress.workspace = true
 parry2d.workspace = true
 parry3d.workspace = true
diff --git a/crates/spawner/src/destroyer.rs b/crates/spawner/src/destroyer.rs
index af45fa18..a8b2578e 100644
--- a/crates/spawner/src/destroyer.rs
+++ b/crates/spawner/src/destroyer.rs
@@ -1,6 +1,14 @@
-use bevy::prelude::*;
-use de_core::{baseset::GameSet, objects::ObjectType, player::Player, state::AppState};
+use bevy::{asset::LoadState, prelude::*};
+use bevy_kira_audio::AudioSource as KAudioSource;
+use de_audio::spatial::{SpatialSoundBundle, Volume};
+use de_core::{
+    baseset::GameSet,
+    objects::{ActiveObjectType, ObjectType},
+    player::Player,
+    state::AppState,
+};
 use de_objects::Health;
+use iyes_progress::{Progress, ProgressSystem};
 
 use crate::{ObjectCounter, SpawnerSet};
 
@@ -8,25 +16,72 @@ pub(crate) struct DestroyerPlugin;
 
 impl Plugin for DestroyerPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(
-            destroy
-                .in_base_set(GameSet::Update)
-                .run_if(in_state(AppState::InGame))
-                .in_set(SpawnerSet::Destroyer),
-        );
+        app.add_system(setup.in_schedule(OnEnter(AppState::AppLoading)))
+            .add_system(load.track_progress().run_if(in_state(AppState::AppLoading)))
+            .add_system(
+                destroy
+                    .in_base_set(GameSet::Update)
+                    .run_if(in_state(AppState::InGame))
+                    .in_set(SpawnerSet::Destroyer),
+            );
+    }
+}
+
+#[derive(Resource)]
+struct DestructionSounds {
+    building: Handle<KAudioSource>,
+    unit: Handle<KAudioSource>,
+}
+
+fn setup(mut commands: Commands, server: Res<AssetServer>) {
+    let sound = server.load("audio/sounds/destruction.wav");
+    commands.insert_resource(DestructionSounds {
+        building: sound.clone(),
+        unit: sound,
+    });
+}
+
+fn load(server: Res<AssetServer>, sounds: Res<DestructionSounds>) -> Progress {
+    Progress {
+        done: [&sounds.building, &sounds.unit]
+            .into_iter()
+            .map(|state| match server.get_load_state(state) {
+                LoadState::Loaded => 1,
+                LoadState::NotLoaded | LoadState::Loading => 0,
+                _ => panic!("Unexpected loading state."),
+            })
+            .sum(),
+        total: 2,
     }
 }
 
 fn destroy(
     mut commands: Commands,
     mut counter: ResMut<ObjectCounter>,
-    entities: Query<(Entity, &Player, &ObjectType, &Health), Changed<Health>>,
+    entities: Query<(Entity, &Player, &ObjectType, &Health, &Transform), Changed<Health>>,
+    sounds: Res<DestructionSounds>,
 ) {
-    for (entity, &player, &object_type, health) in entities.iter() {
+    for (entity, &player, &object_type, health, transform) in entities.iter() {
         if health.destroyed() {
             if let ObjectType::Active(active_type) = object_type {
                 counter.player_mut(player).unwrap().update(active_type, -1);
+
+                commands.spawn((
+                    TransformBundle::from_transform(*transform),
+                    match active_type {
+                        ActiveObjectType::Building(_) => SpatialSoundBundle {
+                            sound: sounds.building.clone(),
+                            ..Default::default()
+                        },
+                        ActiveObjectType::Unit(_) => SpatialSoundBundle {
+                            sound: sounds.unit.clone(),
+                            volume: Volume(0.4),
+                            ..Default::default()
+                        },
+                    },
+                ));
             }
+
             commands.entity(entity).despawn_recursive();
         }
     }
diff --git a/src/main.rs b/src/main.rs
index c82dd28d..a766b3c7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,6 +8,7 @@ use bevy::{
     prelude::*,
     window::WindowMode,
 };
+use bevy_kira_audio::AudioPlugin;
 use de_audio::AudioPluginGroup;
 use de_behaviour::BehaviourPluginGroup;
 use de_camera::CameraPluginGroup;
@@ -62,6 +63,7 @@ fn main() {
                     })
                     .disable::<LogPlugin>(),
             )
+            .add_plugin(AudioPlugin)
             .add_plugin(LogDiagnosticsPlugin {
                 debug: false,
                 wait_duration: Duration::from_secs(10),

From 4fb9526cca37fdf4473fbd8b33c03f535c83c0b0 Mon Sep 17 00:00:00 2001
From: Zakru <23387227+Zakru@users.noreply.github.com>
Date: Fri, 21 Jul 2023 23:36:54 +0300
Subject: [PATCH 2/9] Style improvements

---
 crates/audio/src/spatial.rs | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/crates/audio/src/spatial.rs b/crates/audio/src/spatial.rs
index 58b4bb0e..12fd7039 100644
--- a/crates/audio/src/spatial.rs
+++ b/crates/audio/src/spatial.rs
@@ -3,7 +3,6 @@ use bevy_kira_audio::{
     prelude::{Audio as KAudio, AudioSource as KAudioSource},
     AudioControl, AudioInstance,
 };
-
 use de_camera::CameraFocus;
 use de_core::gamestate::GameState;
 
@@ -68,17 +67,16 @@ fn calculate_volume_and_pan(
     (distance_attenuation as f64, pan as f64)
 }
 
+type UninitializedSound<'s> = (
+    Entity,
+    &'s Handle<KAudioSource>,
+    &'s GlobalTransform,
+    Option<&'s Volume>,
+);
+
 fn start(
     mut commands: Commands,
-    starts: Query<
-        (
-            Entity,
-            &Handle<KAudioSource>,
-            &GlobalTransform,
-            Option<&Volume>,
-        ),
-        (With<SpatialSound>, Without<Handle<AudioInstance>>),
-    >,
+    starts: Query<UninitializedSound, (With<SpatialSound>, Without<Handle<AudioInstance>>)>,
     camera: Query<&GlobalTransform, With<Camera>>,
     focus: Res<CameraFocus>,
     audio: Res<KAudio>,
@@ -97,17 +95,16 @@ fn start(
     }
 }
 
+type InitializedSound<'s> = (
+    Entity,
+    &'s Handle<AudioInstance>,
+    &'s GlobalTransform,
+    Option<&'s Volume>,
+);
+
 fn update_spatial(
     mut commands: Commands,
-    spatial_audios: Query<
-        (
-            Entity,
-            &Handle<AudioInstance>,
-            &GlobalTransform,
-            Option<&Volume>,
-        ),
-        With<SpatialSound>,
-    >,
+    spatial_audios: Query<InitializedSound, With<SpatialSound>>,
     camera: Query<&GlobalTransform, With<Camera>>,
     focus: Res<CameraFocus>,
     mut audio_instances: ResMut<Assets<AudioInstance>>,

From 1f656fc5cc2faf0f533ba98f9e9d228eb2c4f057 Mon Sep 17 00:00:00 2001
From: Zakru <23387227+Zakru@users.noreply.github.com>
Date: Sat, 22 Jul 2023 14:07:58 +0300
Subject: [PATCH 3/9] Add unique destruction sound for units

---
 .../sounds/{destruction.ogg => destruction_building.ogg}    | 0
 assets/audio/sounds/destruction_unit.ogg                    | 3 +++
 crates/spawner/src/destroyer.rs                             | 6 ++----
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename assets/audio/sounds/{destruction.ogg => destruction_building.ogg} (100%)
 create mode 100644 assets/audio/sounds/destruction_unit.ogg

diff --git a/assets/audio/sounds/destruction.ogg b/assets/audio/sounds/destruction_building.ogg
similarity index 100%
rename from assets/audio/sounds/destruction.ogg
rename to assets/audio/sounds/destruction_building.ogg
diff --git a/assets/audio/sounds/destruction_unit.ogg b/assets/audio/sounds/destruction_unit.ogg
new file mode 100644
index 00000000..795d1b1e
--- /dev/null
+++ b/assets/audio/sounds/destruction_unit.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc242ad9851b0fccd8584ccd548b29d96a4920fcbd0d9bdd3525963458efdfac
+size 74811
diff --git a/crates/spawner/src/destroyer.rs b/crates/spawner/src/destroyer.rs
index a8b2578e..cb4b5771 100644
--- a/crates/spawner/src/destroyer.rs
+++ b/crates/spawner/src/destroyer.rs
@@ -34,10 +34,9 @@ struct DestructionSounds {
 }
 
 fn setup(mut commands: Commands, server: Res<AssetServer>) {
-    let sound = server.load("audio/sounds/destruction.wav");
     commands.insert_resource(DestructionSounds {
-        building: sound.clone(),
-        unit: sound,
+        building: server.load("audio/sounds/destruction_building.ogg"),
+        unit: server.load("audio/sounds/destruction_unit.ogg"),
     });
 }
 
@@ -75,7 +74,6 @@ fn destroy(
                         },
                         ActiveObjectType::Unit(_) => SpatialSoundBundle {
                             sound: sounds.unit.clone(),
-                            volume: Volume(0.4),
                             ..Default::default()
                         },
                     },

From 505e971431ef7a8990721e08bf87528759a3f9c5 Mon Sep 17 00:00:00 2001
From: Zakru <23387227+Zakru@users.noreply.github.com>
Date: Sat, 22 Jul 2023 15:50:33 +0300
Subject: [PATCH 4/9] Use events for sound playing logic

---
 Cargo.lock                               |  30 +-----
 Cargo.toml                               |   2 +-
 crates/audio/Cargo.toml                  |   1 +
 crates/audio/src/spatial.rs              | 131 ++++++++++++++---------
 crates/construction/Cargo.toml           |   2 -
 crates/construction/src/manufacturing.rs |  34 +-----
 crates/controller/Cargo.toml             |   2 -
 crates/controller/src/draft.rs           |  34 ++----
 crates/spawner/Cargo.toml                |   2 -
 crates/spawner/src/destroyer.rs          |  63 +++--------
 10 files changed, 104 insertions(+), 197 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8f214253..57a51c0d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2118,6 +2118,7 @@ dependencies = [
  "de_camera",
  "de_conf",
  "de_core",
+ "enum-map",
  "iyes_progress",
 ]
 
@@ -2209,7 +2210,6 @@ version = "0.1.0-dev"
 dependencies = [
  "ahash 0.7.6",
  "bevy",
- "bevy_kira_audio",
  "de_audio",
  "de_core",
  "de_index",
@@ -2217,7 +2217,6 @@ dependencies = [
  "de_pathing",
  "de_signs",
  "de_spawner",
- "iyes_progress",
  "parry2d",
  "parry3d",
 ]
@@ -2228,7 +2227,6 @@ version = "0.1.0-dev"
 dependencies = [
  "ahash 0.7.6",
  "bevy",
- "bevy_kira_audio",
  "de_audio",
  "de_behaviour",
  "de_camera",
@@ -2247,7 +2245,6 @@ dependencies = [
  "de_terrain",
  "enum-map",
  "glam",
- "iyes_progress",
  "parry2d",
  "parry3d",
 ]
@@ -2545,7 +2542,6 @@ version = "0.1.0-dev"
 dependencies = [
  "ahash 0.7.6",
  "bevy",
- "bevy_kira_audio",
  "de_audio",
  "de_core",
  "de_energy",
@@ -2553,7 +2549,6 @@ dependencies = [
  "de_map",
  "de_objects",
  "de_terrain",
- "iyes_progress",
  "parry2d",
  "parry3d",
 ]
@@ -5618,11 +5613,9 @@ checksum = "62e48dba70095f265fdb269b99619b95d04c89e619538138383e63310b14d941"
 dependencies = [
  "lazy_static",
  "symphonia-bundle-mp3",
- "symphonia-codec-pcm",
  "symphonia-codec-vorbis",
  "symphonia-core",
  "symphonia-format-ogg",
- "symphonia-format-wav",
  "symphonia-metadata",
 ]
 
@@ -5639,16 +5632,6 @@ dependencies = [
  "symphonia-metadata",
 ]
 
-[[package]]
-name = "symphonia-codec-pcm"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47f1fbd220a06a641c8ce2ddad10f5ef6ee5cc0c54d9044d25d43b0d3119deaa"
-dependencies = [
- "log",
- "symphonia-core",
-]
-
 [[package]]
 name = "symphonia-codec-vorbis"
 version = "0.5.3"
@@ -5685,17 +5668,6 @@ dependencies = [
  "symphonia-utils-xiph",
 ]
 
-[[package]]
-name = "symphonia-format-wav"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da76614728fa27c003bdcdfbac51396bd8fcbf94c95fe8e62f1d2bac58ef03a4"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-metadata",
-]
-
 [[package]]
 name = "symphonia-metadata"
 version = "0.5.3"
diff --git a/Cargo.toml b/Cargo.toml
index 891511f0..8d301517 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -112,7 +112,7 @@ assert_cmd = "2.0.10"
 async-compat = "0.2.1"
 async-std = "1.11"
 async-tar = "0.4.2"
-bevy_kira_audio = { version = "0.15.0", features = ["mp3", "wav"] }
+bevy_kira_audio = { version = "0.15.0", features = ["mp3"] }
 bincode = "2.0.0-rc.3"
 chrono = "0.4.24"
 clap = { version = "4.0", features = ["derive"] }
diff --git a/crates/audio/Cargo.toml b/crates/audio/Cargo.toml
index 8eaedd6b..8b233ae8 100644
--- a/crates/audio/Cargo.toml
+++ b/crates/audio/Cargo.toml
@@ -20,4 +20,5 @@ de_core.workspace = true
 # Other
 bevy.workspace = true
 bevy_kira_audio.workspace = true
+enum-map.workspace = true
 iyes_progress.workspace = true
diff --git a/crates/audio/src/spatial.rs b/crates/audio/src/spatial.rs
index 12fd7039..c29735b1 100644
--- a/crates/audio/src/spatial.rs
+++ b/crates/audio/src/spatial.rs
@@ -1,106 +1,131 @@
-use bevy::prelude::*;
+use bevy::{asset::LoadState, prelude::*};
 use bevy_kira_audio::{
     prelude::{Audio as KAudio, AudioSource as KAudioSource},
     AudioControl, AudioInstance,
 };
 use de_camera::CameraFocus;
-use de_core::gamestate::GameState;
+use de_core::{baseset::GameSet, gamestate::GameState, state::AppState};
+use enum_map::{enum_map, Enum, EnumMap};
+use iyes_progress::{Progress, ProgressSystem};
 
 pub(crate) struct SpatialSoundPlugin;
 
 impl Plugin for SpatialSoundPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(start.run_if(in_state(GameState::Playing)))
+        app.add_event::<PlaySpatialAudioEvent>()
+            .add_system(setup.in_schedule(OnEnter(AppState::AppLoading)))
+            .add_system(load.track_progress().run_if(in_state(AppState::AppLoading)))
+            .add_system(
+                play.in_base_set(GameSet::PostUpdate)
+                    .run_if(in_state(GameState::Playing))
+                    .run_if(on_event::<PlaySpatialAudioEvent>()),
+            )
             .add_system(
                 update_spatial
-                    .in_base_set(CoreSet::PostUpdate)
+                    .after(play)
+                    .in_base_set(GameSet::PostUpdate)
                     .run_if(in_state(GameState::Playing)),
             );
     }
 }
 
-#[derive(Component, Default)]
-pub struct SpatialSound;
+#[derive(Clone, Copy, Enum)]
+pub enum Sound {
+    Construct,
+    Manufacture,
+    DestroyBuilding,
+    DestroyUnit,
+}
 
-#[derive(Component)]
-pub struct Volume(pub f32);
+pub struct PlaySpatialAudioEvent {
+    pub sound: Sound,
+    pub position: Vec3,
+}
 
-impl Default for Volume {
-    fn default() -> Self {
-        Self(1.)
+impl PlaySpatialAudioEvent {
+    pub fn new(sound: Sound, position: Vec3) -> Self {
+        Self { sound, position }
     }
 }
 
-trait VolumeOptionExt {
-    fn volume(&self) -> f32;
-}
+#[derive(Resource)]
+struct Sounds(EnumMap<Sound, Handle<KAudioSource>>);
 
-impl VolumeOptionExt for Option<&Volume> {
-    fn volume(&self) -> f32 {
-        match self {
-            Some(volume) => volume.0,
-            None => 1.,
-        }
-    }
+#[derive(Component, Default)]
+struct SpatialSound;
+
+fn setup(mut commands: Commands, server: Res<AssetServer>) {
+    use Sound::*;
+    commands.insert_resource(Sounds(enum_map! {
+        Construct => server.load("audio/sounds/construct.ogg"),
+        Manufacture => server.load("audio/sounds/manufacture.ogg"),
+        DestroyBuilding => server.load("audio/sounds/destruction_building.ogg"),
+        DestroyUnit => server.load("audio/sounds/destruction_unit.ogg"),
+    }));
 }
 
-#[derive(Bundle, Default)]
-pub struct SpatialSoundBundle {
-    pub sound: Handle<KAudioSource>,
-    pub spatial_sound: SpatialSound,
-    pub volume: Volume,
+fn load(server: Res<AssetServer>, sounds: Res<Sounds>) -> Progress {
+    Progress {
+        done: sounds
+            .0
+            .values()
+            .map(|handle| match server.get_load_state(handle) {
+                LoadState::Loaded => 1,
+                LoadState::NotLoaded | LoadState::Loading => 0,
+                _ => panic!("Unexpected loading state."),
+            })
+            .sum(),
+        total: sounds
+            .0
+            .len()
+            .try_into()
+            .expect("Trying to load an ungodly number of sounds"),
+    }
 }
 
 fn calculate_volume_and_pan(
     camera: &GlobalTransform,
     focus: &CameraFocus,
-    sound: &GlobalTransform,
+    sound_position: Vec3,
 ) -> (f64, f64) {
     let cam_right = camera.right();
-    let sound_dir = (sound.translation() - camera.translation()).normalize();
+    let sound_dir = (sound_position - camera.translation()).normalize();
     let pan = cam_right.dot(sound_dir) * 0.5 + 0.5;
 
-    let distance_from_camera = camera.translation().distance(sound.translation());
+    let sqr_distance_from_focus = focus.point().distance_squared(sound_position);
     let camera_zoom_distance = focus.distance().inner();
     let distance_attenuation =
-        (1.0 - distance_from_camera / (camera_zoom_distance + 32.) + 0.5).clamp(0.0, 1.0);
+        (camera_zoom_distance * camera_zoom_distance / sqr_distance_from_focus).clamp(0.0, 1.0);
     (distance_attenuation as f64, pan as f64)
 }
 
-type UninitializedSound<'s> = (
-    Entity,
-    &'s Handle<KAudioSource>,
-    &'s GlobalTransform,
-    Option<&'s Volume>,
-);
-
-fn start(
+fn play(
     mut commands: Commands,
-    starts: Query<UninitializedSound, (With<SpatialSound>, Without<Handle<AudioInstance>>)>,
     camera: Query<&GlobalTransform, With<Camera>>,
     focus: Res<CameraFocus>,
     audio: Res<KAudio>,
+    sounds: Res<Sounds>,
+    mut play_events: EventReader<PlaySpatialAudioEvent>,
 ) {
     let camera = camera.single();
 
-    for (entity, sound, transform, sound_volume) in &starts {
-        let (volume, pan) = calculate_volume_and_pan(camera, &focus, transform);
+    for PlaySpatialAudioEvent { sound, position } in &mut play_events {
+        let (volume, pan) = calculate_volume_and_pan(camera, &focus, *position);
         let handle = audio
-            .play(sound.clone())
-            .with_volume(volume * sound_volume.volume() as f64)
+            .play(sounds.0[*sound].clone())
+            .with_volume(volume)
             .with_panning(pan)
             .handle();
 
-        commands.entity(entity).insert(handle);
+        commands.spawn((
+            TransformBundle::from_transform(Transform::from_translation(*position)),
+            handle,
+            SpatialSound,
+        ));
     }
 }
 
-type InitializedSound<'s> = (
-    Entity,
-    &'s Handle<AudioInstance>,
-    &'s GlobalTransform,
-    Option<&'s Volume>,
-);
+type InitializedSound<'s> = (Entity, &'s Handle<AudioInstance>, &'s GlobalTransform);
 
 fn update_spatial(
     mut commands: Commands,
@@ -111,15 +136,15 @@ fn update_spatial(
 ) {
     let camera = camera.single();
 
-    for (entity, audio, transform, sound_volume) in &spatial_audios {
+    for (entity, audio, transform) in &spatial_audios {
         let Some(audio_instance) = audio_instances.get_mut(audio) else {
             commands.entity(entity).despawn();
             continue;
         };
 
-        let (volume, pan) = calculate_volume_and_pan(camera, &focus, transform);
+        let (volume, pan) = calculate_volume_and_pan(camera, &focus, transform.translation());
 
-        audio_instance.set_volume(volume * sound_volume.volume() as f64, default());
+        audio_instance.set_volume(volume, default());
         audio_instance.set_panning(pan, default());
     }
 }
diff --git a/crates/construction/Cargo.toml b/crates/construction/Cargo.toml
index adefe3ee..b6d483d7 100644
--- a/crates/construction/Cargo.toml
+++ b/crates/construction/Cargo.toml
@@ -24,7 +24,5 @@ de_spawner.workspace = true
 # Other
 ahash.workspace = true
 bevy.workspace = true
-bevy_kira_audio.workspace = true
-iyes_progress.workspace = true
 parry2d.workspace = true
 parry3d.workspace = true
diff --git a/crates/construction/src/manufacturing.rs b/crates/construction/src/manufacturing.rs
index 081ebded..8e0ae567 100644
--- a/crates/construction/src/manufacturing.rs
+++ b/crates/construction/src/manufacturing.rs
@@ -1,9 +1,8 @@
 use std::{collections::VecDeque, time::Duration};
 
 use ahash::AHashMap;
-use bevy::{asset::LoadState, prelude::*};
-use bevy_kira_audio::AudioSource as KAudioSource;
-use de_audio::spatial::{SpatialSoundBundle, Volume};
+use bevy::prelude::*;
+use de_audio::spatial::{PlaySpatialAudioEvent, Sound};
 use de_core::{
     baseset::GameSet,
     cleanup::DespawnOnGameExit,
@@ -21,7 +20,6 @@ use de_signs::{
     LineLocation, UpdateLineEndEvent, UpdateLineLocationEvent, UpdatePoleLocationEvent,
 };
 use de_spawner::{ObjectCounter, SpawnBundle};
-use iyes_progress::{Progress, ProgressSystem};
 use parry2d::bounding_volume::Aabb;
 use parry3d::math::Isometry;
 
@@ -35,8 +33,6 @@ impl Plugin for ManufacturingPlugin {
         app.add_event::<EnqueueAssemblyEvent>()
             .add_event::<ChangeDeliveryLocationEvent>()
             .add_event::<DeliverEvent>()
-            .add_system(setup.in_schedule(OnEnter(AppState::AppLoading)))
-            .add_system(load.track_progress().run_if(in_state(AppState::AppLoading)))
             .add_system(
                 configure
                     .in_base_set(GameSet::PostUpdate)
@@ -145,9 +141,6 @@ impl DeliverEvent {
     }
 }
 
-#[derive(Resource)]
-struct AssemblySound(Handle<KAudioSource>);
-
 #[derive(Component)]
 struct DeliveryLocation(Vec2);
 
@@ -314,18 +307,6 @@ impl ProductionItem {
     }
 }
 
-fn setup(mut commands: Commands, server: Res<AssetServer>) {
-    commands.insert_resource(AssemblySound(server.load("audio/sounds/manufacture.ogg")));
-}
-
-fn load(server: Res<AssetServer>, sounds: Res<AssemblySound>) -> Progress {
-    match server.get_load_state(&sounds.0) {
-        LoadState::Loaded => true.into(),
-        LoadState::NotLoaded | LoadState::Loading => false.into(),
-        _ => panic!("Unexpected loading state."),
-    }
-}
-
 fn configure(
     mut commands: Commands,
     solids: SolidObjects,
@@ -448,7 +429,7 @@ fn deliver(
     mut deliver_events: EventReader<DeliverEvent>,
     mut path_events: EventWriter<UpdateEntityPath>,
     factories: Query<(&Transform, &ObjectType, &Player, &DeliveryLocation)>,
-    sound: Res<AssemblySound>,
+    mut play_audio: EventWriter<PlaySpatialAudioEvent>,
 ) {
     for delivery in deliver_events.iter() {
         info!(
@@ -481,14 +462,7 @@ fn deliver(
             ),
         ));
 
-        commands.spawn((
-            TransformBundle::from_transform(Transform::from_translation(spawn_point)),
-            SpatialSoundBundle {
-                sound: sound.0.clone(),
-                volume: Volume(0.4),
-                ..Default::default()
-            },
-        ));
+        play_audio.send(PlaySpatialAudioEvent::new(Sound::Manufacture, spawn_point));
     }
 }
 
diff --git a/crates/controller/Cargo.toml b/crates/controller/Cargo.toml
index 7ac7311b..c0368ee4 100644
--- a/crates/controller/Cargo.toml
+++ b/crates/controller/Cargo.toml
@@ -33,9 +33,7 @@ de_terrain.workspace = true
 # Other
 ahash.workspace = true
 bevy.workspace = true
-bevy_kira_audio.workspace = true
 enum-map.workspace = true
 glam.workspace = true
-iyes_progress.workspace = true
 parry2d.workspace = true
 parry3d.workspace = true
diff --git a/crates/controller/src/draft.rs b/crates/controller/src/draft.rs
index 846fef95..cb86fc7b 100644
--- a/crates/controller/src/draft.rs
+++ b/crates/controller/src/draft.rs
@@ -1,6 +1,5 @@
-use bevy::{asset::LoadState, prelude::*};
-use bevy_kira_audio::AudioSource as KAudioSource;
-use de_audio::spatial::SpatialSoundBundle;
+use bevy::prelude::*;
+use de_audio::spatial::{PlaySpatialAudioEvent, Sound};
 use de_core::{
     baseset::GameSet,
     cleanup::DespawnOnGameExit,
@@ -10,7 +9,6 @@ use de_core::{
     state::AppState,
 };
 use de_spawner::{DraftAllowed, DraftBundle, SpawnBundle};
-use iyes_progress::{Progress, ProgressSystem};
 
 use crate::mouse::{Pointer, PointerSet};
 
@@ -21,8 +19,6 @@ impl Plugin for DraftPlugin {
         app.add_event::<SpawnDraftsEvent>()
             .add_event::<NewDraftEvent>()
             .add_event::<DiscardDraftsEvent>()
-            .add_system(setup.in_schedule(OnEnter(AppState::AppLoading)))
-            .add_system(load.track_progress().run_if(in_state(AppState::AppLoading)))
             .add_system(
                 spawn
                     .in_base_set(GameSet::Input)
@@ -85,26 +81,11 @@ impl NewDraftEvent {
     }
 }
 
-#[derive(Resource)]
-struct ConstructionSound(Handle<KAudioSource>);
-
-fn setup(mut commands: Commands, server: Res<AssetServer>) {
-    commands.insert_resource(ConstructionSound(server.load("audio/sounds/construct.ogg")));
-}
-
-fn load(server: Res<AssetServer>, sound: Res<ConstructionSound>) -> Progress {
-    match server.get_load_state(&sound.0) {
-        LoadState::Loaded => true.into(),
-        LoadState::NotLoaded | LoadState::Loading => false.into(),
-        _ => panic!("Unexpected loading state."),
-    }
-}
-
 fn spawn(
     mut commands: Commands,
     game_config: Res<GameConfig>,
     drafts: Query<(Entity, &Transform, &ObjectType, &DraftAllowed)>,
-    sound: Res<ConstructionSound>,
+    mut play_audio: EventWriter<PlaySpatialAudioEvent>,
 ) {
     for (entity, &transform, &object_type, draft) in drafts.iter() {
         if draft.allowed() {
@@ -115,12 +96,9 @@ fn spawn(
                 DespawnOnGameExit,
             ));
 
-            commands.spawn((
-                TransformBundle::from_transform(transform),
-                SpatialSoundBundle {
-                    sound: sound.0.clone(),
-                    ..Default::default()
-                },
+            play_audio.send(PlaySpatialAudioEvent::new(
+                Sound::Construct,
+                transform.translation,
             ));
         }
     }
diff --git a/crates/spawner/Cargo.toml b/crates/spawner/Cargo.toml
index 47d50111..f585541c 100644
--- a/crates/spawner/Cargo.toml
+++ b/crates/spawner/Cargo.toml
@@ -27,7 +27,5 @@ de_energy.workspace = true
 # Other
 ahash.workspace = true
 bevy.workspace = true
-bevy_kira_audio.workspace = true
-iyes_progress.workspace = true
 parry2d.workspace = true
 parry3d.workspace = true
diff --git a/crates/spawner/src/destroyer.rs b/crates/spawner/src/destroyer.rs
index cb4b5771..9af40155 100644
--- a/crates/spawner/src/destroyer.rs
+++ b/crates/spawner/src/destroyer.rs
@@ -1,6 +1,5 @@
-use bevy::{asset::LoadState, prelude::*};
-use bevy_kira_audio::AudioSource as KAudioSource;
-use de_audio::spatial::{SpatialSoundBundle, Volume};
+use bevy::prelude::*;
+use de_audio::spatial::{PlaySpatialAudioEvent, Sound};
 use de_core::{
     baseset::GameSet,
     objects::{ActiveObjectType, ObjectType},
@@ -8,7 +7,6 @@ use de_core::{
     state::AppState,
 };
 use de_objects::Health;
-use iyes_progress::{Progress, ProgressSystem};
 
 use crate::{ObjectCounter, SpawnerSet};
 
@@ -16,41 +14,12 @@ pub(crate) struct DestroyerPlugin;
 
 impl Plugin for DestroyerPlugin {
     fn build(&self, app: &mut App) {
-        app.add_system(setup.in_schedule(OnEnter(AppState::AppLoading)))
-            .add_system(load.track_progress().run_if(in_state(AppState::AppLoading)))
-            .add_system(
-                destroy
-                    .in_base_set(GameSet::Update)
-                    .run_if(in_state(AppState::InGame))
-                    .in_set(SpawnerSet::Destroyer),
-            );
-    }
-}
-
-#[derive(Resource)]
-struct DestructionSounds {
-    building: Handle<KAudioSource>,
-    unit: Handle<KAudioSource>,
-}
-
-fn setup(mut commands: Commands, server: Res<AssetServer>) {
-    commands.insert_resource(DestructionSounds {
-        building: server.load("audio/sounds/destruction_building.ogg"),
-        unit: server.load("audio/sounds/destruction_unit.ogg"),
-    });
-}
-
-fn load(server: Res<AssetServer>, sounds: Res<DestructionSounds>) -> Progress {
-    Progress {
-        done: [&sounds.building, &sounds.unit]
-            .into_iter()
-            .map(|state| match server.get_load_state(state) {
-                LoadState::Loaded => 1,
-                LoadState::NotLoaded | LoadState::Loading => 0,
-                _ => panic!("Unexpected loading state."),
-            })
-            .sum(),
-        total: 2,
+        app.add_system(
+            destroy
+                .in_base_set(GameSet::Update)
+                .run_if(in_state(AppState::InGame))
+                .in_set(SpawnerSet::Destroyer),
+        );
     }
 }
 
@@ -58,25 +27,19 @@ fn destroy(
     mut commands: Commands,
     mut counter: ResMut<ObjectCounter>,
     entities: Query<(Entity, &Player, &ObjectType, &Health, &Transform), Changed<Health>>,
-    sounds: Res<DestructionSounds>,
+    mut play_audio: EventWriter<PlaySpatialAudioEvent>,
 ) {
     for (entity, &player, &object_type, health, transform) in entities.iter() {
         if health.destroyed() {
             if let ObjectType::Active(active_type) = object_type {
                 counter.player_mut(player).unwrap().update(active_type, -1);
 
-                commands.spawn((
-                    TransformBundle::from_transform(*transform),
+                play_audio.send(PlaySpatialAudioEvent::new(
                     match active_type {
-                        ActiveObjectType::Building(_) => SpatialSoundBundle {
-                            sound: sounds.building.clone(),
-                            ..Default::default()
-                        },
-                        ActiveObjectType::Unit(_) => SpatialSoundBundle {
-                            sound: sounds.unit.clone(),
-                            ..Default::default()
-                        },
+                        ActiveObjectType::Building(_) => Sound::DestroyBuilding,
+                        ActiveObjectType::Unit(_) => Sound::DestroyUnit,
                     },
+                    transform.translation,
                 ));
             }
 

From 7c28352aa0ab890b1eadc7fe1ab72791cf335b7c Mon Sep 17 00:00:00 2001
From: Zakru <23387227+Zakru@users.noreply.github.com>
Date: Sat, 22 Jul 2023 17:58:02 +0300
Subject: [PATCH 5/9] Change to linear sound falloff

---
 crates/audio/src/spatial.rs | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/crates/audio/src/spatial.rs b/crates/audio/src/spatial.rs
index c29735b1..4a7482cf 100644
--- a/crates/audio/src/spatial.rs
+++ b/crates/audio/src/spatial.rs
@@ -8,6 +8,18 @@ use de_core::{baseset::GameSet, gamestate::GameState, state::AppState};
 use enum_map::{enum_map, Enum, EnumMap};
 use iyes_progress::{Progress, ProgressSystem};
 
+/// The start of the linear falloff for sounds, in units of camera zoom distance
+/// from the camera focus
+const SOUND_FALLOFF_START_RATIO: f32 = 0.7;
+/// The end of the linear falloff for sounds, in units of camera zoom distance
+/// from the camera focus
+const SOUND_FALLOFF_END_RATIO: f32 = 1.0;
+/// This is added to the camera zoom distance for sound falloff to make the range
+/// larger with a very close zoom.
+const SOUND_FALLOFF_BIAS: f32 = 20.0;
+/// The calculated length of the linear falloff
+const SOUND_FALLOFF_LENGTH: f32 = SOUND_FALLOFF_END_RATIO - SOUND_FALLOFF_START_RATIO;
+
 pub(crate) struct SpatialSoundPlugin;
 
 impl Plugin for SpatialSoundPlugin {
@@ -83,6 +95,12 @@ fn load(server: Res<AssetServer>, sounds: Res<Sounds>) -> Progress {
     }
 }
 
+/// Clamped linear function passing through (start, 1) and (end, 0).
+/// `distance_ratio` is in units of camera zoom distance.
+fn sound_falloff(distance_ratio: f32) -> f32 {
+    ((SOUND_FALLOFF_END_RATIO - distance_ratio) / SOUND_FALLOFF_LENGTH).clamp(0.0, 1.0)
+}
+
 fn calculate_volume_and_pan(
     camera: &GlobalTransform,
     focus: &CameraFocus,
@@ -92,10 +110,10 @@ fn calculate_volume_and_pan(
     let sound_dir = (sound_position - camera.translation()).normalize();
     let pan = cam_right.dot(sound_dir) * 0.5 + 0.5;
 
-    let sqr_distance_from_focus = focus.point().distance_squared(sound_position);
-    let camera_zoom_distance = focus.distance().inner();
-    let distance_attenuation =
-        (camera_zoom_distance * camera_zoom_distance / sqr_distance_from_focus).clamp(0.0, 1.0);
+    let distance_from_focus = focus.point().distance(sound_position);
+    let biased_zoom_distance = focus.distance().inner() + SOUND_FALLOFF_BIAS;
+
+    let distance_attenuation = sound_falloff(distance_from_focus / biased_zoom_distance);
     (distance_attenuation as f64, pan as f64)
 }
 

From 8ef76f7deee235f5b9a7858df0e2d67ab23dd93c Mon Sep 17 00:00:00 2001
From: Zakru <23387227+Zakru@users.noreply.github.com>
Date: Mon, 24 Jul 2023 00:15:43 +0300
Subject: [PATCH 6/9] Add a few attenuation options with debug controls

1, 2, 3, 4 => No distance attenuation; Linear from camera focus;
InvSqr from camera; InvSqr from focus

8, 9, 0 => No view occlusion; Only play sounds in view; Occlude sounds based on
angle
---
 crates/audio/src/spatial.rs | 162 +++++++++++++++++++++++++++++++-----
 1 file changed, 143 insertions(+), 19 deletions(-)

diff --git a/crates/audio/src/spatial.rs b/crates/audio/src/spatial.rs
index 4a7482cf..150b1594 100644
--- a/crates/audio/src/spatial.rs
+++ b/crates/audio/src/spatial.rs
@@ -1,4 +1,6 @@
-use bevy::{asset::LoadState, prelude::*};
+use std::f32::consts::PI;
+
+use bevy::{asset::LoadState, input::keyboard::KeyboardInput, prelude::*};
 use bevy_kira_audio::{
     prelude::{Audio as KAudio, AudioSource as KAudioSource},
     AudioControl, AudioInstance,
@@ -8,25 +10,42 @@ use de_core::{baseset::GameSet, gamestate::GameState, state::AppState};
 use enum_map::{enum_map, Enum, EnumMap};
 use iyes_progress::{Progress, ProgressSystem};
 
+// Linear falloff parameters
+
 /// The start of the linear falloff for sounds, in units of camera zoom distance
 /// from the camera focus
-const SOUND_FALLOFF_START_RATIO: f32 = 0.7;
+const SOUND_LINEAR_FALLOFF_START_RATIO: f32 = 0.7;
 /// The end of the linear falloff for sounds, in units of camera zoom distance
 /// from the camera focus
-const SOUND_FALLOFF_END_RATIO: f32 = 1.0;
+const SOUND_LINEAR_FALLOFF_END_RATIO: f32 = 1.0;
 /// This is added to the camera zoom distance for sound falloff to make the range
 /// larger with a very close zoom.
-const SOUND_FALLOFF_BIAS: f32 = 20.0;
+const SOUND_LINEAR_FALLOFF_BIAS: f32 = 20.0;
 /// The calculated length of the linear falloff
-const SOUND_FALLOFF_LENGTH: f32 = SOUND_FALLOFF_END_RATIO - SOUND_FALLOFF_START_RATIO;
+const SOUND_LINEAR_FALLOFF_LENGTH: f32 =
+    SOUND_LINEAR_FALLOFF_END_RATIO - SOUND_LINEAR_FALLOFF_START_RATIO;
+
+// Angle occlusion parameters
+
+/// The angle is calculated from a point this many units behind the camera
+const SOUND_VIEW_ANGLE_OFFSET: f32 = 32.0;
 
 pub(crate) struct SpatialSoundPlugin;
 
 impl Plugin for SpatialSoundPlugin {
     fn build(&self, app: &mut App) {
         app.add_event::<PlaySpatialAudioEvent>()
+            .insert_resource(SoundAttenuation {
+                attenuation: None,
+                occlusion: None,
+            })
             .add_system(setup.in_schedule(OnEnter(AppState::AppLoading)))
             .add_system(load.track_progress().run_if(in_state(AppState::AppLoading)))
+            .add_system(
+                change_attenuation
+                    .in_base_set(GameSet::Input)
+                    .run_if(in_state(GameState::Playing)),
+            )
             .add_system(
                 play.in_base_set(GameSet::PostUpdate)
                     .run_if(in_state(GameState::Playing))
@@ -63,6 +82,30 @@ impl PlaySpatialAudioEvent {
 #[derive(Resource)]
 struct Sounds(EnumMap<Sound, Handle<KAudioSource>>);
 
+#[derive(Clone, Copy)]
+enum Attenuation {
+    /// Linear attenuation based on the camera's focal point
+    LinearFromFocus,
+    /// Inverse square attenuation
+    InverseSquare,
+    /// Inverse square attenuation based on the camera's focal point
+    InverseSquareFromFocus,
+}
+
+#[derive(Clone, Copy)]
+enum Occlusion {
+    /// Only play sounds inside the view
+    HardFrustum,
+    /// Adjust volume based on the angle from the camera
+    Angle,
+}
+
+#[derive(Resource)]
+struct SoundAttenuation {
+    attenuation: Option<Attenuation>,
+    occlusion: Option<Occlusion>,
+}
+
 #[derive(Component, Default)]
 struct SpatialSound;
 
@@ -95,40 +138,114 @@ fn load(server: Res<AssetServer>, sounds: Res<Sounds>) -> Progress {
     }
 }
 
-/// Clamped linear function passing through (start, 1) and (end, 0).
-/// `distance_ratio` is in units of camera zoom distance.
-fn sound_falloff(distance_ratio: f32) -> f32 {
-    ((SOUND_FALLOFF_END_RATIO - distance_ratio) / SOUND_FALLOFF_LENGTH).clamp(0.0, 1.0)
+fn change_attenuation(
+    mut key_events: EventReader<KeyboardInput>,
+    mut attenuation: ResMut<SoundAttenuation>,
+) {
+    for key_code in key_events.iter().filter_map(|e| e.key_code) {
+        match key_code {
+            KeyCode::Key1 => attenuation.attenuation = None,
+            KeyCode::Key2 => attenuation.attenuation = Some(Attenuation::LinearFromFocus),
+            KeyCode::Key3 => attenuation.attenuation = Some(Attenuation::InverseSquare),
+            KeyCode::Key4 => attenuation.attenuation = Some(Attenuation::InverseSquareFromFocus),
+
+            KeyCode::Key8 => attenuation.occlusion = None,
+            KeyCode::Key9 => attenuation.occlusion = Some(Occlusion::HardFrustum),
+            KeyCode::Key0 => attenuation.occlusion = Some(Occlusion::Angle),
+
+            _ => (),
+        }
+    }
 }
 
 fn calculate_volume_and_pan(
     camera: &GlobalTransform,
     focus: &CameraFocus,
     sound_position: Vec3,
+    attenuation: &SoundAttenuation,
+    camera_config: &Camera,
 ) -> (f64, f64) {
     let cam_right = camera.right();
     let sound_dir = (sound_position - camera.translation()).normalize();
     let pan = cam_right.dot(sound_dir) * 0.5 + 0.5;
 
-    let distance_from_focus = focus.point().distance(sound_position);
-    let biased_zoom_distance = focus.distance().inner() + SOUND_FALLOFF_BIAS;
+    let attenuation_factor = match attenuation.attenuation {
+        Some(Attenuation::LinearFromFocus) => {
+            let distance_from_focus = focus.point().distance(sound_position);
+            let biased_zoom_distance = focus.distance().inner() + SOUND_LINEAR_FALLOFF_BIAS;
+
+            let distance_ratio = distance_from_focus / biased_zoom_distance;
+            // Clamped linear function passing through (start, 1) and (end, 0) in X units of camera zoom distance.
+            ((SOUND_LINEAR_FALLOFF_END_RATIO - distance_ratio) / SOUND_LINEAR_FALLOFF_LENGTH)
+                .clamp(0.0, 1.0)
+        }
+        Some(Attenuation::InverseSquare) => {
+            let distance_from_camera_squared =
+                camera.translation().distance_squared(sound_position);
+            // Anything closer than 70% of zoom distance is at full volume.
+            let min_distance_squared = (0.7 * focus.distance().inner()).powi(2);
+
+            (min_distance_squared / distance_from_camera_squared).min(1.)
+        }
+        Some(Attenuation::InverseSquareFromFocus) => {
+            let distance_from_focus_squared = focus.point().distance_squared(sound_position);
+            // Anything closer than 70% of zoom distance is at full volume.
+            let min_distance_squared = (0.7 * focus.distance().inner()).powi(2);
+
+            (min_distance_squared / distance_from_focus_squared).min(1.)
+        }
+        None => 1.,
+    };
+
+    let occlusion_factor = match attenuation.occlusion {
+        Some(Occlusion::HardFrustum) => {
+            if let Some(ndc) = camera_config.world_to_ndc(camera, sound_position) {
+                if (-1.0..=1.0).contains(&ndc.x)
+                    && (-1.0..=1.0).contains(&ndc.y)
+                    && (0.0..=1.0).contains(&ndc.z)
+                {
+                    1.
+                } else {
+                    0.
+                }
+            } else {
+                0.
+            }
+        }
+        Some(Occlusion::Angle) => {
+            // Volume is 1 from 0-25.5 degrees from the view direction, then linearly goes to 0 from 25.5-45 degrees.
+            // Angle is calculated from a point slightly behind the camera.
+            let camera_offset = camera.translation() + camera.back() * SOUND_VIEW_ANGLE_OFFSET;
+            let angle = (sound_position - camera_offset).angle_between(camera.forward());
+
+            // Slope parameter of linear function (-1 unit in 25.5 degrees or pi/8)
+            const SLOPE: f32 = -1.0 / (PI / 8.);
+            // Constant parameter of linear function
+            const CONSTANT: f32 = 2.0;
+            (SLOPE * angle + CONSTANT).clamp(0.0, 1.0)
+        }
+        None => 1.,
+    };
+
+    let volume = attenuation_factor * occlusion_factor;
 
-    let distance_attenuation = sound_falloff(distance_from_focus / biased_zoom_distance);
-    (distance_attenuation as f64, pan as f64)
+    (volume as f64, pan as f64)
 }
 
 fn play(
     mut commands: Commands,
-    camera: Query<&GlobalTransform, With<Camera>>,
+    camera: Query<(&GlobalTransform, &Camera)>,
     focus: Res<CameraFocus>,
     audio: Res<KAudio>,
     sounds: Res<Sounds>,
+    attenuation: Res<SoundAttenuation>,
     mut play_events: EventReader<PlaySpatialAudioEvent>,
 ) {
-    let camera = camera.single();
+    let (camera, camera_config) = camera.single();
 
     for PlaySpatialAudioEvent { sound, position } in &mut play_events {
-        let (volume, pan) = calculate_volume_and_pan(camera, &focus, *position);
+        let (volume, pan) =
+            calculate_volume_and_pan(camera, &focus, *position, &attenuation, camera_config);
         let handle = audio
             .play(sounds.0[*sound].clone())
             .with_volume(volume)
@@ -148,11 +265,12 @@ type InitializedSound<'s> = (Entity, &'s Handle<AudioInstance>, &'s GlobalTransf
 fn update_spatial(
     mut commands: Commands,
     spatial_audios: Query<InitializedSound, With<SpatialSound>>,
-    camera: Query<&GlobalTransform, With<Camera>>,
+    camera: Query<(&GlobalTransform, &Camera)>,
     focus: Res<CameraFocus>,
+    attenuation: Res<SoundAttenuation>,
     mut audio_instances: ResMut<Assets<AudioInstance>>,
 ) {
-    let camera = camera.single();
+    let (camera, camera_config) = camera.single();
 
     for (entity, audio, transform) in &spatial_audios {
         let Some(audio_instance) = audio_instances.get_mut(audio) else {
@@ -160,7 +278,13 @@ fn update_spatial(
             continue;
         };
 
-        let (volume, pan) = calculate_volume_and_pan(camera, &focus, transform.translation());
+        let (volume, pan) = calculate_volume_and_pan(
+            camera,
+            &focus,
+            transform.translation(),
+            &attenuation,
+            camera_config,
+        );
 
         audio_instance.set_volume(volume, default());
         audio_instance.set_panning(pan, default());

From 1b71161ba2299603c9071e0b6cb7d5250a1a2d66 Mon Sep 17 00:00:00 2001
From: Zakru <23387227+Zakru@users.noreply.github.com>
Date: Mon, 24 Jul 2023 23:44:21 +0300
Subject: [PATCH 7/9] Add laser fire sound

---
 Cargo.lock                    | 1 +
 assets/audio/sounds/laser.ogg | 3 +++
 crates/audio/src/spatial.rs   | 2 ++
 crates/combat/Cargo.toml      | 1 +
 crates/combat/src/laser.rs    | 7 +++++++
 5 files changed, 14 insertions(+)
 create mode 100644 assets/audio/sounds/laser.ogg

diff --git a/Cargo.lock b/Cargo.lock
index 57a51c0d..f0675ee6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2152,6 +2152,7 @@ name = "de_combat"
 version = "0.1.0-dev"
 dependencies = [
  "bevy",
+ "de_audio",
  "de_behaviour",
  "de_core",
  "de_index",
diff --git a/assets/audio/sounds/laser.ogg b/assets/audio/sounds/laser.ogg
new file mode 100644
index 00000000..c63630ed
--- /dev/null
+++ b/assets/audio/sounds/laser.ogg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c5eb8c4e70d23db38f64bc0e118ae694a2bfc39241e146ed15162e1dc62f4fc
+size 69940
diff --git a/crates/audio/src/spatial.rs b/crates/audio/src/spatial.rs
index 150b1594..369d2254 100644
--- a/crates/audio/src/spatial.rs
+++ b/crates/audio/src/spatial.rs
@@ -66,6 +66,7 @@ pub enum Sound {
     Manufacture,
     DestroyBuilding,
     DestroyUnit,
+    LaserFire,
 }
 
 pub struct PlaySpatialAudioEvent {
@@ -116,6 +117,7 @@ fn setup(mut commands: Commands, server: Res<AssetServer>) {
         Manufacture => server.load("audio/sounds/manufacture.ogg"),
         DestroyBuilding => server.load("audio/sounds/destruction_building.ogg"),
         DestroyUnit => server.load("audio/sounds/destruction_unit.ogg"),
+        LaserFire => server.load("audio/sounds/laser.ogg"),
     }));
 }
 
diff --git a/crates/combat/Cargo.toml b/crates/combat/Cargo.toml
index 4115a995..42c14ba8 100644
--- a/crates/combat/Cargo.toml
+++ b/crates/combat/Cargo.toml
@@ -13,6 +13,7 @@ categories.workspace = true
 
 [dependencies]
 # DE
+de_audio.workspace = true
 de_core.workspace = true
 de_objects.workspace = true
 de_terrain.workspace = true
diff --git a/crates/combat/src/laser.rs b/crates/combat/src/laser.rs
index 44949d00..9c5d3000 100644
--- a/crates/combat/src/laser.rs
+++ b/crates/combat/src/laser.rs
@@ -1,4 +1,5 @@
 use bevy::prelude::*;
+use de_audio::spatial::{PlaySpatialAudioEvent, Sound};
 use de_core::{baseset::GameSet, gamestate::GameState};
 use de_objects::Health;
 use de_signs::UpdateBarValueEvent;
@@ -78,6 +79,7 @@ fn fire(
     mut susceptible: Query<&mut Health>,
     mut bar: EventWriter<UpdateBarValueEvent>,
     mut trail: EventWriter<TrailEvent>,
+    mut start_sound: EventWriter<PlaySpatialAudioEvent>,
 ) {
     for fire in fires.iter() {
         if susceptible
@@ -99,5 +101,10 @@ fn fire(
             health.hit(fire.damage());
             bar.send(UpdateBarValueEvent::new(entity, health.fraction()));
         }
+
+        start_sound.send(PlaySpatialAudioEvent::new(
+            Sound::LaserFire,
+            fire.ray().origin.into(),
+        ));
     }
 }

From 81f3ffbbc6ce424fa58a3200ddc5f70fd40e9167 Mon Sep 17 00:00:00 2001
From: Zakru <23387227+Zakru@users.noreply.github.com>
Date: Tue, 25 Jul 2023 01:17:06 +0300
Subject: [PATCH 8/9] Decide on audio attenuation and remove debug code

---
 crates/audio/src/spatial.rs | 170 ++++++------------------------------
 1 file changed, 29 insertions(+), 141 deletions(-)

diff --git a/crates/audio/src/spatial.rs b/crates/audio/src/spatial.rs
index 369d2254..d16c8601 100644
--- a/crates/audio/src/spatial.rs
+++ b/crates/audio/src/spatial.rs
@@ -1,6 +1,6 @@
 use std::f32::consts::PI;
 
-use bevy::{asset::LoadState, input::keyboard::KeyboardInput, prelude::*};
+use bevy::{asset::LoadState, prelude::*};
 use bevy_kira_audio::{
     prelude::{Audio as KAudio, AudioSource as KAudioSource},
     AudioControl, AudioInstance,
@@ -10,42 +10,18 @@ use de_core::{baseset::GameSet, gamestate::GameState, state::AppState};
 use enum_map::{enum_map, Enum, EnumMap};
 use iyes_progress::{Progress, ProgressSystem};
 
-// Linear falloff parameters
-
-/// The start of the linear falloff for sounds, in units of camera zoom distance
-/// from the camera focus
-const SOUND_LINEAR_FALLOFF_START_RATIO: f32 = 0.7;
-/// The end of the linear falloff for sounds, in units of camera zoom distance
-/// from the camera focus
-const SOUND_LINEAR_FALLOFF_END_RATIO: f32 = 1.0;
-/// This is added to the camera zoom distance for sound falloff to make the range
-/// larger with a very close zoom.
-const SOUND_LINEAR_FALLOFF_BIAS: f32 = 20.0;
-/// The calculated length of the linear falloff
-const SOUND_LINEAR_FALLOFF_LENGTH: f32 =
-    SOUND_LINEAR_FALLOFF_END_RATIO - SOUND_LINEAR_FALLOFF_START_RATIO;
-
 // Angle occlusion parameters
 
 /// The angle is calculated from a point this many units behind the camera
-const SOUND_VIEW_ANGLE_OFFSET: f32 = 32.0;
+const SOUND_VIEW_ANGLE_OFFSET: f32 = 32.;
 
 pub(crate) struct SpatialSoundPlugin;
 
 impl Plugin for SpatialSoundPlugin {
     fn build(&self, app: &mut App) {
         app.add_event::<PlaySpatialAudioEvent>()
-            .insert_resource(SoundAttenuation {
-                attenuation: None,
-                occlusion: None,
-            })
             .add_system(setup.in_schedule(OnEnter(AppState::AppLoading)))
             .add_system(load.track_progress().run_if(in_state(AppState::AppLoading)))
-            .add_system(
-                change_attenuation
-                    .in_base_set(GameSet::Input)
-                    .run_if(in_state(GameState::Playing)),
-            )
             .add_system(
                 play.in_base_set(GameSet::PostUpdate)
                     .run_if(in_state(GameState::Playing))
@@ -83,30 +59,6 @@ impl PlaySpatialAudioEvent {
 #[derive(Resource)]
 struct Sounds(EnumMap<Sound, Handle<KAudioSource>>);
 
-#[derive(Clone, Copy)]
-enum Attenuation {
-    /// Linear attenuation based on the camera's focal point
-    LinearFromFocus,
-    /// Inverse square attenuation
-    InverseSquare,
-    /// Inverse square attenuation based on the camera's focal point
-    InverseSquareFromFocus,
-}
-
-#[derive(Clone, Copy)]
-enum Occlusion {
-    /// Only play sounds inside the view
-    HardFrustum,
-    /// Adjust volume based on the angle from the camera
-    Angle,
-}
-
-#[derive(Resource)]
-struct SoundAttenuation {
-    attenuation: Option<Attenuation>,
-    occlusion: Option<Occlusion>,
-}
-
 #[derive(Component, Default)]
 struct SpatialSound;
 
@@ -140,114 +92,57 @@ fn load(server: Res<AssetServer>, sounds: Res<Sounds>) -> Progress {
     }
 }
 
-fn change_attenuation(
-    mut key_events: EventReader<KeyboardInput>,
-    mut attenuation: ResMut<SoundAttenuation>,
-) {
-    for key_code in key_events.iter().filter_map(|e| e.key_code) {
-        match key_code {
-            KeyCode::Key1 => attenuation.attenuation = None,
-            KeyCode::Key2 => attenuation.attenuation = Some(Attenuation::LinearFromFocus),
-            KeyCode::Key3 => attenuation.attenuation = Some(Attenuation::InverseSquare),
-            KeyCode::Key4 => attenuation.attenuation = Some(Attenuation::InverseSquareFromFocus),
-
-            KeyCode::Key8 => attenuation.occlusion = None,
-            KeyCode::Key9 => attenuation.occlusion = Some(Occlusion::HardFrustum),
-            KeyCode::Key0 => attenuation.occlusion = Some(Occlusion::Angle),
-
-            _ => (),
-        }
-    }
-}
-
 fn calculate_volume_and_pan(
     camera: &GlobalTransform,
     focus: &CameraFocus,
     sound_position: Vec3,
-    attenuation: &SoundAttenuation,
-    camera_config: &Camera,
 ) -> (f64, f64) {
     let cam_right = camera.right();
     let sound_dir = (sound_position - camera.translation()).normalize();
     let pan = cam_right.dot(sound_dir) * 0.5 + 0.5;
 
-    let attenuation_factor = match attenuation.attenuation {
-        Some(Attenuation::LinearFromFocus) => {
-            let distance_from_focus = focus.point().distance(sound_position);
-            let biased_zoom_distance = focus.distance().inner() + SOUND_LINEAR_FALLOFF_BIAS;
-
-            let distance_ratio = distance_from_focus / biased_zoom_distance;
-            // Clamped linear function passing through (start, 1) and (end, 0) in X units of camera zoom distance.
-            ((SOUND_LINEAR_FALLOFF_END_RATIO - distance_ratio) / SOUND_LINEAR_FALLOFF_LENGTH)
-                .clamp(0.0, 1.0)
-        }
-        Some(Attenuation::InverseSquare) => {
-            let distance_from_camera_squared =
-                camera.translation().distance_squared(sound_position);
-            // Anything closer than 70% of zoom distance is at full volume.
-            let min_distance_squared = (0.7 * focus.distance().inner()).powi(2);
+    // Simulates sounds becoming quieter when further away
+    let attenuation_factor = {
+        let distance_from_camera_squared = camera.translation().distance_squared(sound_position);
+        // Anything closer than 70% of zoom distance is at full volume.
+        let min_distance_squared = (0.7 * focus.distance().inner()).powi(2);
 
-            (min_distance_squared / distance_from_camera_squared).min(1.)
-        }
-        Some(Attenuation::InverseSquareFromFocus) => {
-            let distance_from_focus_squared = focus.point().distance_squared(sound_position);
-            // Anything closer than 70% of zoom distance is at full volume.
-            let min_distance_squared = (0.7 * focus.distance().inner()).powi(2);
-
-            (min_distance_squared / distance_from_focus_squared).min(1.)
-        }
-        None => 1.,
+        min_distance_squared / distance_from_camera_squared
     };
 
-    let occlusion_factor = match attenuation.occlusion {
-        Some(Occlusion::HardFrustum) => {
-            if let Some(ndc) = camera_config.world_to_ndc(camera, sound_position) {
-                if (-1.0..=1.0).contains(&ndc.x)
-                    && (-1.0..=1.0).contains(&ndc.y)
-                    && (0.0..=1.0).contains(&ndc.z)
-                {
-                    1.
-                } else {
-                    0.
-                }
-            } else {
-                0.
-            }
-        }
-        Some(Occlusion::Angle) => {
-            // Volume is 1 from 0-25.5 degrees from the view direction, then linearly goes to 0 from 25.5-45 degrees.
-            // Angle is calculated from a point slightly behind the camera.
-            let camera_offset = camera.translation() + camera.back() * SOUND_VIEW_ANGLE_OFFSET;
-            let angle = (sound_position - camera_offset).angle_between(camera.forward());
-
-            // Slope parameter of linear function (-1 unit in 25.5 degrees or pi/8)
-            const SLOPE: f32 = -1.0 / (PI / 8.);
-            // Constant parameter of linear function
-            const CONSTANT: f32 = 2.0;
-            (SLOPE * angle + CONSTANT).clamp(0.0, 1.0)
-        }
-        None => 1.,
+    // Silences sounds whose sources are not in view
+    let occlusion_factor = {
+        // Volume is 1 from 0-25.5 degrees from the view direction, then linearly goes to 0 from 25.5-45 degrees.
+        // Angle is calculated from a point slightly behind the camera.
+        let camera_offset = camera.translation() + camera.back() * SOUND_VIEW_ANGLE_OFFSET;
+        let angle = (sound_position - camera_offset).angle_between(camera.forward());
+
+        // Slope parameter of linear function (-1 unit in 25.5 degrees or pi/8)
+        const SLOPE: f32 = -1.0 / (PI / 8.);
+        // Constant parameter of linear function
+        const CONSTANT: f32 = 2.0;
+        // Let's limit this to non-negative to avoid the weirdness that
+        // occurs if both factors end up being negative at some point
+        (SLOPE * angle + CONSTANT).max(0.0)
     };
 
-    let volume = attenuation_factor * occlusion_factor;
+    let volume = (attenuation_factor * occlusion_factor).clamp(0., 1.);
 
     (volume as f64, pan as f64)
 }
 
 fn play(
     mut commands: Commands,
-    camera: Query<(&GlobalTransform, &Camera)>,
+    camera: Query<&GlobalTransform, With<Camera>>,
     focus: Res<CameraFocus>,
     audio: Res<KAudio>,
     sounds: Res<Sounds>,
-    attenuation: Res<SoundAttenuation>,
     mut play_events: EventReader<PlaySpatialAudioEvent>,
 ) {
-    let (camera, camera_config) = camera.single();
+    let camera = camera.single();
 
     for PlaySpatialAudioEvent { sound, position } in &mut play_events {
-        let (volume, pan) =
-            calculate_volume_and_pan(camera, &focus, *position, &attenuation, camera_config);
+        let (volume, pan) = calculate_volume_and_pan(camera, &focus, *position);
         let handle = audio
             .play(sounds.0[*sound].clone())
             .with_volume(volume)
@@ -267,12 +162,11 @@ type InitializedSound<'s> = (Entity, &'s Handle<AudioInstance>, &'s GlobalTransf
 fn update_spatial(
     mut commands: Commands,
     spatial_audios: Query<InitializedSound, With<SpatialSound>>,
-    camera: Query<(&GlobalTransform, &Camera)>,
+    camera: Query<&GlobalTransform, With<Camera>>,
     focus: Res<CameraFocus>,
-    attenuation: Res<SoundAttenuation>,
     mut audio_instances: ResMut<Assets<AudioInstance>>,
 ) {
-    let (camera, camera_config) = camera.single();
+    let camera = camera.single();
 
     for (entity, audio, transform) in &spatial_audios {
         let Some(audio_instance) = audio_instances.get_mut(audio) else {
@@ -280,13 +174,7 @@ fn update_spatial(
             continue;
         };
 
-        let (volume, pan) = calculate_volume_and_pan(
-            camera,
-            &focus,
-            transform.translation(),
-            &attenuation,
-            camera_config,
-        );
+        let (volume, pan) = calculate_volume_and_pan(camera, &focus, transform.translation());
 
         audio_instance.set_volume(volume, default());
         audio_instance.set_panning(pan, default());

From 91a10ca9965f14ff0f435c9725a4c76e19f1648f Mon Sep 17 00:00:00 2001
From: Zakru <23387227+Zakru@users.noreply.github.com>
Date: Thu, 27 Jul 2023 19:09:01 +0300
Subject: [PATCH 9/9] Migrate PR to Bevy 0.11

---
 Cargo.lock                      | 17 +++++++++++++----
 crates/audio/src/spatial.rs     | 25 +++++++++++++------------
 crates/spawner/src/despawner.rs | 15 +++++++++++++--
 3 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 76191f0e..c8b04d35 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1084,9 +1084,9 @@ dependencies = [
 
 [[package]]
 name = "bevy_kira_audio"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "468257f6c7980d847aba0e9b6c9e4ff4045598510637d6e484b5f290c00a1f92"
+checksum = "7fc50583e632d0173437cb618077f957c1eb7a9eef9bce107fbf9f90b22e4f84"
 dependencies = [
  "anyhow",
  "bevy",
@@ -3162,6 +3162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42218cb640844e3872cc3c153dc975229e080a6c4733b34709ef445610550226"
 dependencies = [
  "bytemuck",
+ "mint",
  "serde",
 ]
 
@@ -3802,12 +3803,14 @@ dependencies = [
 
 [[package]]
 name = "kira"
-version = "0.7.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e53aef6f6ec851da68a0ad6d6283bd99ea1a9164f38fd7ac353e28ccd6f5cda"
+checksum = "39ce67549ab39d620131643a37f60b520ec4ae4450dc230f4c6296d3533272a3"
 dependencies = [
  "atomic-arena",
  "cpal",
+ "glam",
+ "mint",
  "ringbuf",
  "symphonia",
 ]
@@ -4067,6 +4070,12 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+
 [[package]]
 name = "mio"
 version = "0.8.8"
diff --git a/crates/audio/src/spatial.rs b/crates/audio/src/spatial.rs
index d16c8601..3bb77376 100644
--- a/crates/audio/src/spatial.rs
+++ b/crates/audio/src/spatial.rs
@@ -6,7 +6,7 @@ use bevy_kira_audio::{
     AudioControl, AudioInstance,
 };
 use de_camera::CameraFocus;
-use de_core::{baseset::GameSet, gamestate::GameState, state::AppState};
+use de_core::{gamestate::GameState, state::AppState};
 use enum_map::{enum_map, Enum, EnumMap};
 use iyes_progress::{Progress, ProgressSystem};
 
@@ -20,17 +20,17 @@ pub(crate) struct SpatialSoundPlugin;
 impl Plugin for SpatialSoundPlugin {
     fn build(&self, app: &mut App) {
         app.add_event::<PlaySpatialAudioEvent>()
-            .add_system(setup.in_schedule(OnEnter(AppState::AppLoading)))
-            .add_system(load.track_progress().run_if(in_state(AppState::AppLoading)))
-            .add_system(
-                play.in_base_set(GameSet::PostUpdate)
-                    .run_if(in_state(GameState::Playing))
-                    .run_if(on_event::<PlaySpatialAudioEvent>()),
+            .add_systems(OnEnter(AppState::AppLoading), setup)
+            .add_systems(
+                Update,
+                load.track_progress().run_if(in_state(AppState::AppLoading)),
             )
-            .add_system(
-                update_spatial
-                    .after(play)
-                    .in_base_set(GameSet::PostUpdate)
+            .add_systems(
+                PostUpdate,
+                (
+                    play.run_if(on_event::<PlaySpatialAudioEvent>()),
+                    update_spatial.after(play),
+                )
                     .run_if(in_state(GameState::Playing)),
             );
     }
@@ -45,6 +45,7 @@ pub enum Sound {
     LaserFire,
 }
 
+#[derive(Event)]
 pub struct PlaySpatialAudioEvent {
     pub sound: Sound,
     pub position: Vec3,
@@ -170,7 +171,7 @@ fn update_spatial(
 
     for (entity, audio, transform) in &spatial_audios {
         let Some(audio_instance) = audio_instances.get_mut(audio) else {
-            commands.entity(entity).despawn();
+            commands.entity(entity).despawn_recursive();
             continue;
         };
 
diff --git a/crates/spawner/src/despawner.rs b/crates/spawner/src/despawner.rs
index 4091fed9..8411ce2f 100644
--- a/crates/spawner/src/despawner.rs
+++ b/crates/spawner/src/despawner.rs
@@ -2,6 +2,8 @@ use std::marker::PhantomData;
 
 use bevy::ecs::query::{ReadOnlyWorldQuery, WorldQuery};
 use bevy::prelude::*;
+use de_audio::spatial::{PlaySpatialAudioEvent, Sound};
+use de_core::objects::ActiveObjectType;
 use de_core::{objects::ObjectType, player::Player, state::AppState};
 use de_objects::Health;
 
@@ -43,13 +45,22 @@ pub struct DespawnEvent(Entity);
 /// Find all entities with low health and mark them for despawning
 fn find_dead(
     mut counter: ResMut<ObjectCounter>,
-    entities: Query<(Entity, &Player, &ObjectType, &Health), Changed<Health>>,
+    entities: Query<(Entity, &Player, &ObjectType, &Health, &Transform), Changed<Health>>,
     mut event_writer: EventWriter<DespawnEvent>,
+    mut play_audio: EventWriter<PlaySpatialAudioEvent>,
 ) {
-    for (entity, &player, &object_type, health) in entities.iter() {
+    for (entity, &player, &object_type, health, transform) in entities.iter() {
         if health.destroyed() {
             if let ObjectType::Active(active_type) = object_type {
                 counter.player_mut(player).unwrap().update(active_type, -1);
+
+                play_audio.send(PlaySpatialAudioEvent::new(
+                    match active_type {
+                        ActiveObjectType::Building(_) => Sound::DestroyBuilding,
+                        ActiveObjectType::Unit(_) => Sound::DestroyUnit,
+                    },
+                    transform.translation,
+                ));
             }
             event_writer.send(DespawnEvent(entity));
         }