src/lib.rs

@@ -73,16 +73,6 @@ impl Default for Sound {
     }
 }
 
-#[derive(Component, Clone, Copy, Debug, Deref, DerefMut)]
-// #[reflect(Component)]
-pub struct PannerStrategy(pub syz::PannerStrategy);
-
-impl Default for PannerStrategy {
-    fn default() -> Self {
-        Self(syz::PannerStrategy::Delegate)
-    }
-}
-
 #[derive(Component, Clone, Copy, Debug, Deref, DerefMut)]
 pub struct DistanceModel(pub syz::DistanceModel);
 
@@ -199,33 +189,11 @@ fn swap_buffers(
     }
 }
 
-fn change_panner_strategy(
-    changed: Query<Entity, Changed<PannerStrategy>>,
-    removed: RemovedComponents<PannerStrategy>,
-    mut sounds: Query<&mut Sound>,
-) {
-    let mut check = vec![];
-    for entity in changed.iter() {
-        check.push(entity);
-    }
-    for entity in removed.iter() {
-        check.push(entity);
-    }
-    for entity in check.iter() {
-        if let Ok(mut sound) = sounds.get_mut(*entity) {
-            if sound.source.is_some() {
-                sound.source = None;
-            }
-        }
-    }
-}
-
 pub fn update_sound_properties(
     context: Res<syz::Context>,
     buffers: Res<Assets<Buffer>>,
     mut query: Query<(
         &mut Sound,
-        Option<&PannerStrategy>,
         Option<&DistanceModel>,
         Option<&DistanceRef>,
         Option<&DistanceMax>,
@@ -240,7 +208,6 @@ pub fn update_sound_properties(
 ) {
     for (
         mut sound,
-        panner_strategy,
         distance_model,
         distance_ref,
         distance_max,
@@ -283,10 +250,9 @@ pub fn update_sound_properties(
                 if let Some(generator) = sound.generator.as_mut() {
                     generator.buffer().set(&**b).expect("Unable to set buffer");
                     if let Some(translation) = translation {
-                        let panner_strategy = panner_strategy.cloned().unwrap_or_default();
                         let source = syz::Source3D::new(
                             &context,
-                            *panner_strategy,
+                            syz::PannerStrategy::Delegate,
                             (
                                 translation.x as f64,
                                 translation.y as f64,
@@ -299,19 +265,20 @@ pub fn update_sound_properties(
                             .expect("Unable to add generator");
                         sound.source = Some(source.into());
                     } else if let Some(scalar_pan) = scalar_pan {
-                        let panner_strategy = panner_strategy.cloned().unwrap_or_default();
+                        let source = syz::ScalarPannedSource::new(
-                        let source =
+                            &context,
-                            syz::ScalarPannedSource::new(&context, *panner_strategy, **scalar_pan)
+                            syz::PannerStrategy::Delegate,
-                                .expect("Failed to create source");
+                            **scalar_pan,
+                        )
+                        .expect("Failed to create source");
                         source
                             .add_generator(generator)
                             .expect("Failed to add generator");
                         sound.source = Some(source.into());
                     } else if let Some(angular_pan) = angular_pan {
-                        let panner_strategy = panner_strategy.cloned().unwrap_or_default();
                         let source = syz::AngularPannedSource::new(
                             &context,
-                            *panner_strategy,
+                            syz::PannerStrategy::Delegate,
                             angular_pan.azimuth,
                             angular_pan.elevation,
                         )
@@ -592,10 +559,6 @@ impl Plugin for SynthizerPlugin {
                 CoreStage::PostUpdate,
                 swap_buffers.before(update_sound_properties),
             )
-            .add_system_to_stage(
-                CoreStage::PostUpdate,
-                change_panner_strategy.before(update_sound_properties),
-            )
             .add_system_to_stage(
                 CoreStage::PostUpdate,
                 update_listener