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

Sync states more aggressively, and use property defaults when components don't exist.

Browse Source
This commit is contained in:
Nolan Darilek 2022-05-18 19:44:31 -05:00
parent eab98cca4e
commit 6b4daf5764
1 changed files with 72 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
src/lib.rs
View File

@ -199,37 +199,42 @@ pub fn update_sound_properties(
} }
sound.restart = false; sound.restart = false;
} }
if let Some(b) = buffers.get(sound.buffer.clone()) { if sound.generator.is_none() {
if sound.source.is_none() { let generator =
let generator = syz::BufferGenerator::new(&context).expect("Failed to create generator");
syz::BufferGenerator::new(&context).expect("Failed to create generator"); sound.generator = Some(generator);
generator.buffer().set(&**b).expect("Unable to set buffer"); }
let translation = global_transform let translation = global_transform
.map(|v| v.translation) .map(|v| v.translation)
.or_else(|| transform.map(|v| v.translation)); .or_else(|| transform.map(|v| v.translation));
if let Some(translation) = translation { if sound.source.is_none() {
let source = syz::Source3D::new( if let Some(b) = buffers.get(sound.buffer.clone()) {
&context, if let Some(generator) = sound.generator.as_mut() {
syz::PannerStrategy::Delegate, generator.buffer().set(&**b).expect("Unable to set buffer");
( if let Some(translation) = translation {
translation.x as f64, let source = syz::Source3D::new(
translation.y as f64, &context,
translation.z as f64, syz::PannerStrategy::Delegate,
), (
) translation.x as f64,
.expect("Failed to create source"); translation.y as f64,
source translation.z as f64,
.add_generator(&generator) ),
.expect("Unable to add generator"); )
sound.source = Some(source.into()); .expect("Failed to create source");
} else { source
let source = syz::DirectSource::new(&context).expect("Failed to create source"); .add_generator(generator)
source .expect("Unable to add generator");
.add_generator(&generator) sound.source = Some(source.into());
.expect("Failed to add generator"); } else {
sound.source = Some(source.into()); let source =
syz::DirectSource::new(&context).expect("Failed to create source");
source
.add_generator(generator)
.expect("Failed to add generator");
sound.source = Some(source.into());
}
} }
sound.generator = Some(generator);
} }
} }
if let Some(generator) = sound.generator.as_mut() { if let Some(generator) = sound.generator.as_mut() {
@ -244,55 +249,63 @@ pub fn update_sound_properties(
} }
if let Some(source) = sound.source.as_mut() { if let Some(source) = sound.source.as_mut() {
source.gain().set(gain).expect("Failed to set gain"); source.gain().set(gain).expect("Failed to set gain");
let translation = global_transform
.map(|v| v.translation)
.or_else(|| transform.map(|v| v.translation));
if let Some(translation) = translation { if let Some(translation) = translation {
let source = source.cast_to::<syz::Source3D>().unwrap().unwrap(); if let Some(source) = source.cast_to::<syz::Source3D>().unwrap() {
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");
if let Some(distance_model) = distance_model { let distance_model = distance_model
.cloned()
.map(|v| *v)
.unwrap_or_else(|| context.default_distance_modle().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
if let Some(distance_ref) = distance_ref { .map(|v| **v)
.unwrap_or_else(|| context.default_distance_ref().get().unwrap());
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
if let Some(distance_max) = distance_max { .map(|v| **v)
.unwrap_or_else(|| context.default_distance_max().get().unwrap());
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
if let Some(rolloff) = rolloff { .map(|v| **v)
.unwrap_or_else(|| context.default_rolloff().get().unwrap());
source source
.rolloff() .rolloff()
.set(**rolloff) .set(rolloff)
.expect("Failed to set rolloff"); .expect("Failed to set rolloff");
} let closeness_boost = closeness_boost
if let Some(closeness_boost) = closeness_boost { .map(|v| **v)
.unwrap_or_else(|| context.default_closeness_boost().get().unwrap());
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 =
if let Some(closeness_boost_distance) = closeness_boost_distance { closeness_boost_distance.map(|v| **v).unwrap_or_else(|| {
context.default_closeness_boost_distance().get().unwrap()
});
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 {
sound.source = None;
} }
} }
} }