diff --git a/Cargo.toml b/Cargo.toml index 86fe923..adaedec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,13 +9,13 @@ license = "MIT OR Apache-2.0" [dependencies] anyhow = "1.0" -bevy = { version = "0.12", default-features = false, features = ["bevy_audio"] } +bevy = { version = "0.13", default-features = false, features = ["bevy_audio"] } bevy_mod_sysfail = "3.0" libfmod = "~2.206.2" [dev-dependencies] # The examples need the default features of bevy -bevy = { version = "0.12", default-features = true } +bevy = { version = "0.13", default-features = true } [features] default = [] diff --git a/README.md b/README.md index 68e1e8b..23969b7 100644 --- a/README.md +++ b/README.md @@ -38,9 +38,9 @@ This requires a free FMOD account. - Install the package. - You need the following 4 files in the root of your rust project: - `api/core/lib/x64/fmod.dll` - - `api/core/lib/x64/fmod_vc.lib`: **rename to `fmod.lib`** + - `api/core/lib/x64/fmod_vc.lib` - `api/studio/lib/x64/fmodstudio.dll` - - `api/studio/lib/x64/fmodstudio_vc.lib`: **rename to `fmodstudio.lib`** + - `api/studio/lib/x64/fmodstudio_vc.lib` ### Linux diff --git a/examples/audio_control.rs b/examples/audio_control.rs index 5c09469..86310cc 100644 --- a/examples/audio_control.rs +++ b/examples/audio_control.rs @@ -42,20 +42,20 @@ fn play_music(mut audio_sources: Query<&AudioSource, With>) { audio_sources.single_mut().play(); } -fn audio_control(query: Query<&AudioSource>, input: Res>) { - if input.just_pressed(KeyCode::S) { +fn audio_control(query: Query<&AudioSource>, input: Res>) { + if input.just_pressed(KeyCode::KeyS) { for audio_player in query.iter() { audio_player.stop(); } } - if input.just_pressed(KeyCode::P) { + if input.just_pressed(KeyCode::KeyP) { for audio_player in query.iter() { audio_player.play(); } } - if input.just_pressed(KeyCode::T) { + if input.just_pressed(KeyCode::KeyT) { for audio_player in query.iter() { audio_player.toggle(); } diff --git a/examples/parameters.rs b/examples/parameters.rs index 2f5bedc..7e27c19 100644 --- a/examples/parameters.rs +++ b/examples/parameters.rs @@ -44,9 +44,9 @@ fn main() { DefaultPlugins, FmodPlugin { audio_banks_paths: &[ - "./assets/Master.bank", - "./assets/Master.strings.bank", - "./assets/SFX.bank", + "./assets/audio/demo_project/Build/Desktop/Master.bank", + "./assets/audio/demo_project/Build/Desktop/Master.strings.bank", + "./assets/audio/demo_project/Build/Desktop/SFX.bank", ], }, )) @@ -82,8 +82,11 @@ fn play_music(audio_sources: Query<&AudioSource>) { } } -fn set_rain(audio_sources: Query<&AudioSource, With>, input: Res>) { - if input.just_pressed(KeyCode::Up) { +fn set_rain( + audio_sources: Query<&AudioSource, With>, + input: Res>, +) { + if input.just_pressed(KeyCode::ArrowUp) { for audio_source in audio_sources.iter() { audio_source .event_instance @@ -92,7 +95,7 @@ fn set_rain(audio_sources: Query<&AudioSource, With>, input: Re } } - if input.just_pressed(KeyCode::Down) { + if input.just_pressed(KeyCode::ArrowDown) { for audio_source in audio_sources.iter() { audio_source .event_instance @@ -104,9 +107,9 @@ fn set_rain(audio_sources: Query<&AudioSource, With>, input: Re fn set_hour( audio_sources: Query<&AudioSource, With>, - input: Res>, + input: Res>, ) { - if input.just_pressed(KeyCode::E) { + if input.just_pressed(KeyCode::KeyE) { for audio_source in audio_sources.iter() { audio_source .event_instance @@ -115,7 +118,7 @@ fn set_hour( } } - if input.just_pressed(KeyCode::M) { + if input.just_pressed(KeyCode::KeyM) { for audio_source in audio_sources.iter() { audio_source .event_instance diff --git a/examples/spatial.rs b/examples/spatial.rs index c4bc840..3c0b727 100644 --- a/examples/spatial.rs +++ b/examples/spatial.rs @@ -7,7 +7,6 @@ use bevy::prelude::*; use bevy_fmod::prelude::AudioSource; -use bevy_fmod::prelude::SpatialAudioBundle; use bevy_fmod::prelude::*; fn main() { @@ -37,8 +36,8 @@ fn setup_scene( ) { // Plane commands.spawn(PbrBundle { - mesh: meshes.add(shape::Plane::from_size(5.0).into()), - material: materials.add(Color::rgb(0.3, 0.5, 0.3).into()), + mesh: meshes.add(Plane3d::default().mesh().size(5.0, 5.0)), + material: materials.add(Color::rgb(0.3, 0.5, 0.3)), transform: Transform::from_xyz(0.0, -1.0, 0.0), ..default() }); @@ -46,7 +45,6 @@ fn setup_scene( // Light commands.spawn(PointLightBundle { point_light: PointLight { - intensity: 1500.0, shadows_enabled: true, ..default() }, @@ -68,8 +66,8 @@ fn setup_scene( commands .spawn(SpatialAudioBundle::new(event_description)) .insert(PbrBundle { - mesh: meshes.add(Mesh::from(shape::Cube { size: 1.0 })), - material: materials.add(Color::rgb(0.8, 0.7, 0.6).into()), + mesh: meshes.add(Cuboid::default()), + material: materials.add(Color::rgb(0.8, 0.7, 0.6)), transform: Transform::from_scale(Vec3::splat(0.2)), ..default() }); @@ -90,7 +88,7 @@ fn orbit_audio_source( } fn update_listener( - keyboard: Res>, + keyboard: Res>, time: Res