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

Use plugin struct for settings.

Browse Source
This commit is contained in:
Nolan Darilek 2022-12-15 14:04:57 -06:00
parent 32734f31d5
commit 5f2881d1c8
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/game.rs
View File

@ -64,12 +64,11 @@ fn rotate_listener(time: Res<Time>, mut query: Query<(&mut RotationTimer, &mut T
fn main() { fn main() {
App::new() App::new()
.add_plugins(DefaultPlugins) .add_plugins(DefaultPlugins)
.insert_resource(SynthizerConfig { .add_plugin(SynthizerPlugin {
default_panner_strategy: Some(bevy_synthizer::syz::PannerStrategy::Hrtf), default_panner_strategy: Some(bevy_synthizer::syz::PannerStrategy::Hrtf),
default_distance_model: Some(bevy_synthizer::syz::DistanceModel::Inverse), default_distance_model: Some(bevy_synthizer::syz::DistanceModel::Inverse),
..default() ..default()
}) })
.add_plugin(SynthizerPlugin)
.add_system(bevy::window::close_on_esc) .add_system(bevy::window::close_on_esc)
.init_resource::<AssetHandles>() .init_resource::<AssetHandles>()
.add_startup_system(setup) .add_startup_system(setup)

34
src/lib.rs
View File

@ -563,19 +563,6 @@ fn remove_sound(mut last_buffer: ResMut<LastBuffer>, removed: RemovedComponents<
} }
} }
#[derive(Resource, Clone, Default, Debug)]
pub struct SynthizerConfig {
pub default_panner_strategy: Option<syz::PannerStrategy>,
pub default_distance_model: Option<syz::DistanceModel>,
pub default_distance_ref: Option<f64>,
pub default_distance_max: Option<f64>,
pub default_rolloff: Option<f64>,
pub default_closeness_boost: Option<f64>,
pub default_closeness_boost_distance: Option<f64>,
pub log_level: syz::LogLevel,
pub log_to_stderr: bool,
}
#[derive(Resource, Debug)] #[derive(Resource, Debug)]
pub struct SynthizerDefaults { pub struct SynthizerDefaults {
pub panner_strategy: syz::PannerStrategy, pub panner_strategy: syz::PannerStrategy,
@ -589,7 +576,7 @@ pub struct SynthizerDefaults {
fn sync_config( fn sync_config(
context: Res<Context>, context: Res<Context>,
config: Res<SynthizerConfig>, config: Res<SynthizerPlugin>,
defaults: Res<SynthizerDefaults>, defaults: Res<SynthizerDefaults>,
) { ) {
if config.is_changed() { if config.is_changed() {
@ -682,14 +669,25 @@ pub enum SynthizerSystems {
#[derive(Resource)] #[derive(Resource)]
struct InitializationGuard(syz::InitializationGuard); struct InitializationGuard(syz::InitializationGuard);
pub struct SynthizerPlugin; #[derive(Resource, Clone, Default, Debug)]
pub struct SynthizerPlugin {
pub default_panner_strategy: Option<syz::PannerStrategy>,
pub default_distance_model: Option<syz::DistanceModel>,
pub default_distance_ref: Option<f64>,
pub default_distance_max: Option<f64>,
pub default_rolloff: Option<f64>,
pub default_closeness_boost: Option<f64>,
pub default_closeness_boost_distance: Option<f64>,
pub log_level: syz::LogLevel,
pub log_to_stderr: bool,
}
impl Plugin for SynthizerPlugin { impl Plugin for SynthizerPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
if !app.world.contains_resource::<SynthizerConfig>() { if !app.world.contains_resource::<SynthizerPlugin>() {
app.insert_resource(SynthizerConfig::default()); app.insert_resource(self.clone());
} }
let config = app.world.get_resource::<SynthizerConfig>().unwrap().clone(); let config = app.world.get_resource::<SynthizerPlugin>().unwrap().clone();
let mut syz_config = syz::LibraryConfig::new(); let mut syz_config = syz::LibraryConfig::new();
syz_config.log_level(config.log_level); syz_config.log_level(config.log_level);
if config.log_to_stderr { if config.log_to_stderr {