projects/bevy_synthizer
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Add ability to set panner strategy on source creation.

Browse Source
This commit is contained in:
Nolan Darilek 2022-06-13 09:14:11 -05:00
parent 4e6c01d654
commit 28718d2e85
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lib.rs
View File

@ -73,6 +73,16 @@ 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)] #[derive(Component, Clone, Copy, Debug, Deref, DerefMut)]
pub struct DistanceModel(pub syz::DistanceModel); pub struct DistanceModel(pub syz::DistanceModel);
@ -194,6 +204,7 @@ pub fn update_sound_properties(
buffers: Res<Assets<Buffer>>, buffers: Res<Assets<Buffer>>,
mut query: Query<( mut query: Query<(
&mut Sound, &mut Sound,
Option<&PannerStrategy>,
Option<&DistanceModel>, Option<&DistanceModel>,
Option<&DistanceRef>, Option<&DistanceRef>,
Option<&DistanceMax>, Option<&DistanceMax>,
@ -208,6 +219,7 @@ pub fn update_sound_properties(
) { ) {
for ( for (
mut sound, mut sound,
panner_strategy,
distance_model, distance_model,
distance_ref, distance_ref,
distance_max, distance_max,
@ -250,9 +262,10 @@ pub fn update_sound_properties(
if let Some(generator) = sound.generator.as_mut() { if let Some(generator) = sound.generator.as_mut() {
generator.buffer().set(&**b).expect("Unable to set buffer"); generator.buffer().set(&**b).expect("Unable to set buffer");
if let Some(translation) = translation { if let Some(translation) = translation {
let panner_strategy = panner_strategy.cloned().unwrap_or_default();
let source = syz::Source3D::new( let source = syz::Source3D::new(
&context, &context,
syz::PannerStrategy::Delegate, *panner_strategy,
( (
translation.x as f64, translation.x as f64,
translation.y as f64, translation.y as f64,
@ -265,20 +278,19 @@ pub fn update_sound_properties(
.expect("Unable to add generator"); .expect("Unable to add generator");
sound.source = Some(source.into()); sound.source = Some(source.into());
} else if let Some(scalar_pan) = scalar_pan { } else if let Some(scalar_pan) = scalar_pan {
let source = syz::ScalarPannedSource::new( let panner_strategy = panner_strategy.cloned().unwrap_or_default();
&context, let source =
syz::PannerStrategy::Delegate, syz::ScalarPannedSource::new(&context, *panner_strategy, **scalar_pan)
**scalar_pan, .expect("Failed to create source");
)
.expect("Failed to create source");
source source
.add_generator(generator) .add_generator(generator)
.expect("Failed to add generator"); .expect("Failed to add generator");
sound.source = Some(source.into()); sound.source = Some(source.into());
} else if let Some(angular_pan) = angular_pan { } else if let Some(angular_pan) = angular_pan {
let panner_strategy = panner_strategy.cloned().unwrap_or_default();
let source = syz::AngularPannedSource::new( let source = syz::AngularPannedSource::new(
&context, &context,
syz::PannerStrategy::Delegate, *panner_strategy,
angular_pan.azimuth, angular_pan.azimuth,
angular_pan.elevation, angular_pan.elevation,
) )