From 4b0f23c0db97587131806b79f2d17c1bf93036c6 Mon Sep 17 00:00:00 2001
From: Nolan Darilek <nolan@thewordnerd.info>
Date: Mon, 24 May 2021 15:34:38 -0500
Subject: [PATCH] Flatten sound icons.

---
 src/sound.rs | 112 +++++++++++++++++++++------------------------------
 1 file changed, 45 insertions(+), 67 deletions(-)

diff --git a/src/sound.rs b/src/sound.rs
index 508f1d7..f873242 100644
--- a/src/sound.rs
+++ b/src/sound.rs
@@ -1,11 +1,6 @@
 use std::{collections::HashMap, fmt::Debug, hash::Hash, time::Duration};
 
-use bevy::{
-    asset::{HandleId, LoadState},
-    ecs::component::Component,
-    prelude::*,
-    transform::TransformSystem,
-};
+use bevy::{asset::HandleId, ecs::component::Component, prelude::*, transform::TransformSystem};
 use bevy_openal::{Buffer, Context, Sound, SoundState};
 
 use rand::random;
@@ -133,22 +128,38 @@ fn footstep(
     }
 }
 
-fn sound_icon<S>(
+fn add_sound_icon_sounds(
     mut commands: Commands,
+    icons: Query<(Entity, &SoundIcon), Added<SoundIcon>>,
+    assets: Res<Assets<Buffer>>,
+) {
+    for (entity, icon) in icons.iter() {
+        let buffer = assets.get_handle(icon.sound);
+        let looping = icon.interval.is_none();
+        commands.entity(entity).insert(Sound {
+            buffer,
+            gain: icon.gain,
+            pitch: icon.pitch,
+            looping,
+            state: SoundState::Stopped,
+            ..Default::default()
+        });
+    }
+}
+
+fn sound_icon<S>(
     config: Res<SoundConfig<S>>,
     state: Res<State<S>>,
     time: Res<Time>,
-    asset_server: Res<AssetServer>,
-    viewers: Query<(&Player, &Viewshed)>,
+    viewers: Query<&Viewshed, With<Player>>,
     mut icons: Query<(
-        Entity,
         &mut SoundIcon,
         Option<&Coordinates>,
         Option<&Parent>,
-        Option<&Children>,
+        &mut Sound,
     )>,
     coordinates_storage: Query<&Coordinates>,
-    mut sounds: Query<&mut Sound>,
+    buffers: Res<Assets<Buffer>>,
 ) where
     S: Component + Clone + Debug + Eq + Hash,
 {
@@ -157,8 +168,8 @@ fn sound_icon<S>(
             return;
         }
     }
-    for (_, viewer) in viewers.iter() {
-        for (entity, mut icon, coordinates, parent, children) in icons.iter_mut() {
+    for viewer in viewers.iter() {
+        for (mut icon, coordinates, parent, mut sound) in icons.iter_mut() {
             let coords = if let Some(coordinates) = coordinates {
                 *coordinates
             } else if let Some(parent) = parent {
@@ -169,61 +180,27 @@ fn sound_icon<S>(
                 panic!("No `Coordinates` on `SoundIcon` or parent");
             };
             if viewer.is_visible(&coords) {
-                let buffer = asset_server.get_handle(icon.sound);
-                if asset_server.get_load_state(&buffer) == LoadState::Loaded {
-                    let looping = icon.interval.is_none();
-                    let sound = Sound {
-                        buffer,
-                        gain: icon.gain,
-                        pitch: icon.pitch,
-                        looping,
-                        state: SoundState::Playing,
-                        ..Default::default()
-                    };
-                    if looping && children.is_none() {
-                        let child = commands
-                            .spawn()
-                            .insert(sound)
-                            .insert(Transform::default())
-                            .insert(GlobalTransform::default())
-                            .id();
-                        commands.entity(entity).push_children(&[child]);
-                    } else if let Some(ref mut interval) = icon.interval {
-                        interval.tick(time.delta());
-                        if interval.finished() {
-                            if let Some(children) = children {
-                                for child in children.iter() {
-                                    commands.entity(*child).despawn();
-                                }
-                            }
-                            let child = commands
-                                .spawn()
-                                .insert(sound)
-                                .insert(Transform::default())
-                                .insert(GlobalTransform::default())
-                                .id();
-                            commands.entity(entity).push_children(&[child]);
-                            interval.reset();
-                        }
-                    }
-                    if let Some(children) = children {
-                        if let Some(child) = children.get(0) {
-                            if let Ok(mut sound) = sounds.get_mut(*child) {
-                                let buffer = asset_server.get_handle(icon.sound);
-                                if sound.buffer != buffer {
-                                    sound.stop();
-                                    sound.buffer = buffer;
-                                    sound.play();
-                                }
-                                sound.gain = icon.gain;
-                                sound.pitch = icon.pitch;
-                                sound.reference_distance = icon.reference_distance;
-                                sound.max_distance = icon.max_distance;
-                                sound.rolloff_factor = icon.rolloff_factor;
-                            }
-                        }
+                let looping = sound.looping;
+                if looping {
+                    sound.state = SoundState::Playing;
+                } else if let Some(interval) = icon.interval.as_mut() {
+                    interval.tick(time.delta());
+                    if interval.finished() {
+                        sound.state = SoundState::Playing;
+                        interval.reset();
                     }
                 }
+                let buffer = buffers.get_handle(icon.sound);
+                sound.looping = icon.interval.is_none();
+                if sound.buffer != buffer {
+                    sound.stop();
+                    sound.buffer = buffer;
+                }
+                sound.gain = icon.gain;
+                sound.pitch = icon.pitch;
+                sound.reference_distance = icon.reference_distance;
+                sound.max_distance = icon.max_distance;
+                sound.rolloff_factor = icon.rolloff_factor;
             }
         }
     }
@@ -303,6 +280,7 @@ where
                 CoreStage::PostUpdate,
                 footstep.system().after(TransformSystem::TransformPropagate),
             )
+            .add_system(add_sound_icon_sounds.system())
             .add_system_to_stage(
                 CoreStage::PostUpdate,
                 sound_icon::<S>