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

fix: Clear generator when source is cleared, and improve handling for changing source types.

Browse Source
This commit is contained in:
Nolan Darilek 2024-12-02 11:34:28 -06:00
parent 2364f638db
commit 4c02a98eb4
1 changed files with 115 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

213
src/lib.rs
View File

@ -403,6 +403,7 @@ fn update_source_properties(
Option<&AngularPan>, Option<&AngularPan>,
Option<&ScalarPan>, Option<&ScalarPan>,
Option<&GlobalTransform>, Option<&GlobalTransform>,
Option<&mut Sound>,
)>, )>,
) { ) {
for ( for (
@ -416,110 +417,126 @@ fn update_source_properties(
angular_pan, angular_pan,
scalar_pan, scalar_pan,
transform, transform,
sound,
) in &mut query ) in &mut query
{ {
let Source { gain, .. } = *source; let Source { gain, .. } = *source;
assert!(gain >= 0.); assert!(gain >= 0.);
if let Some(handle) = source.handle.as_mut() { let Some(handle) = source.handle.as_mut() else {
handle.gain().set(gain).expect("Failed to set gain"); continue;
let mut clear_source = false; };
handle.gain().set(gain).expect("Failed to set gain");
let mut clear_source = false;
if let Some(source) = handle.cast_to::<syz::Source3D>().expect("Failed to cast") {
if let Some(transform) = transform { if let Some(transform) = transform {
if let Some(source) = handle.cast_to::<syz::Source3D>().expect("Failed to cast") { let translation = transform.translation();
let translation = transform.translation(); source
source .position()
.position() .set((
.set(( translation.x as f64,
translation.x as f64, translation.y as f64,
translation.y as f64, translation.z as f64,
translation.z as f64, ))
)) .expect("Failed to set position");
.expect("Failed to set position"); let distance_model = distance_model
let distance_model = distance_model .cloned()
.cloned() .map(|v| *v)
.map(|v| *v) .unwrap_or_else(|| context.default_distance_model().get().unwrap());
.unwrap_or_else(|| context.default_distance_model().get().unwrap()); source
source .distance_model()
.distance_model() .set(distance_model)
.set(distance_model) .expect("Failed to set distance_model");
.expect("Failed to set distance_model"); let distance_ref = distance_ref
let distance_ref = distance_ref .map(|v| **v)
.map(|v| **v) .unwrap_or_else(|| context.default_distance_ref().get().unwrap());
.unwrap_or_else(|| context.default_distance_ref().get().unwrap()); assert!(distance_ref >= 0.);
assert!(distance_ref >= 0.); source
source .distance_ref()
.distance_ref() .set(distance_ref)
.set(distance_ref) .expect("Failed to set distance_ref");
.expect("Failed to set distance_ref"); let distance_max = distance_max
let distance_max = distance_max .map(|v| **v)
.map(|v| **v) .unwrap_or_else(|| context.default_distance_max().get().unwrap());
.unwrap_or_else(|| context.default_distance_max().get().unwrap()); assert!(distance_max >= 0.);
assert!(distance_max >= 0.); source
source .distance_max()
.distance_max() .set(distance_max)
.set(distance_max) .expect("Failed to set distance_max");
.expect("Failed to set distance_max"); let rolloff = rolloff
let rolloff = rolloff .map(|v| **v)
.map(|v| **v) .unwrap_or_else(|| context.default_rolloff().get().unwrap());
.unwrap_or_else(|| context.default_rolloff().get().unwrap()); assert!(rolloff >= 0.);
assert!(rolloff >= 0.); assert!(rolloff >= 0.);
source source
.rolloff() .rolloff()
.set(rolloff) .set(rolloff)
.expect("Failed to set rolloff"); .expect("Failed to set rolloff");
let closeness_boost = closeness_boost let closeness_boost = closeness_boost
.map(|v| **v) .map(|v| **v)
.unwrap_or_else(|| context.default_closeness_boost().get().unwrap()); .unwrap_or_else(|| context.default_closeness_boost().get().unwrap());
assert!(closeness_boost >= 0.); assert!(closeness_boost >= 0.);
source source
.closeness_boost() .closeness_boost()
.set(closeness_boost) .set(closeness_boost)
.expect("Failed to set closeness_boost"); .expect("Failed to set closeness_boost");
let closeness_boost_distance = let closeness_boost_distance = closeness_boost_distance
closeness_boost_distance.map(|v| **v).unwrap_or_else(|| { .map(|v| **v)
context.default_closeness_boost_distance().get().unwrap() .unwrap_or_else(|| context.default_closeness_boost_distance().get().unwrap());
}); assert!(closeness_boost_distance >= 0.);
assert!(closeness_boost_distance >= 0.); source
source .closeness_boost_distance()
.closeness_boost_distance() .set(closeness_boost_distance)
.set(closeness_boost_distance) .expect("Failed to set closeness_boost_distance");
.expect("Failed to set closeness_boost_distance"); } else {
} else { println!("Clearing 3D source because no transform");
clear_source = true; clear_source = true;
}
} else if let Some(angular_pan) = angular_pan {
if let Some(source) = handle
.cast_to::<syz::AngularPannedSource>()
.expect("Failed to cast")
{
assert!(angular_pan.azimuth >= 0. && angular_pan.azimuth <= 360.);
source
.azimuth()
.set(angular_pan.azimuth)
.expect("Failed to set azimuth");
assert!(angular_pan.elevation >= -90. && angular_pan.elevation <= 90.);
source
.elevation()
.set(angular_pan.elevation)
.expect("Failed to set elevation");
} else {
clear_source = true;
}
} else if let Some(scalar_pan) = scalar_pan {
if let Some(source) = handle
.cast_to::<syz::ScalarPannedSource>()
.expect("Failed to cast")
{
assert!(**scalar_pan >= -1. && **scalar_pan <= 1.);
source
.panning_scalar()
.set(**scalar_pan)
.expect("Failed to set scalar panning");
} else {
clear_source = true;
}
} }
if clear_source { } else if let Some(source) = handle
source.handle = None; .cast_to::<syz::AngularPannedSource>()
.expect("Failed to cast")
{
if let Some(angular_pan) = angular_pan {
assert!(angular_pan.azimuth >= 0. && angular_pan.azimuth <= 360.);
source
.azimuth()
.set(angular_pan.azimuth)
.expect("Failed to set azimuth");
assert!(angular_pan.elevation >= -90. && angular_pan.elevation <= 90.);
source
.elevation()
.set(angular_pan.elevation)
.expect("Failed to set elevation");
} else {
clear_source = true;
}
} else if let Some(source) = handle
.cast_to::<syz::ScalarPannedSource>()
.expect("Failed to cast")
{
if let Some(scalar_pan) = scalar_pan {
assert!(**scalar_pan >= -1. && **scalar_pan <= 1.);
source
.panning_scalar()
.set(**scalar_pan)
.expect("Failed to set scalar panning");
} else {
clear_source = true;
}
} else if handle
.cast_to::<syz::DirectSource>()
.expect("Failed to cast")
.is_some()
{
if transform.is_some() || angular_pan.is_some() || scalar_pan.is_some() {
clear_source = true;
}
} else if source.handle.is_some() {
clear_source = true;
}
if clear_source {
source.handle = None;
if let Some(mut sound) = sound {
sound.generator = None;
} }
} }
} }