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

chore: Update to Bevy 0.16.

Browse Source
This commit is contained in:
Nolan Darilek 2025-05-16 10:26:13 -05:00
parent 7b0b3d8262
commit 6a2182ce52
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.toml
View File

@ -10,12 +10,12 @@ repository = "https://labs.lightsout.games/projects/bevy_synthizer"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
bevy = { version = "0.15", default-features = false, features = ["bevy_asset"] } bevy = { version = "0.16", default-features = false, features = ["bevy_asset"] }
synthizer = "0.5.6" synthizer = "0.5.6"
thiserror = "1" thiserror = "2"
[dev-dependencies] [dev-dependencies]
bevy = { version = "0.15", default-features = true } bevy = { version = "0.16", default-features = true }
[package.metadata.release] [package.metadata.release]
publish = false publish = false

20
src/lib.rs
View File

@ -188,7 +188,7 @@ fn update_listener(
context: ResMut<Context>, context: ResMut<Context>,
listener: Query<Option<&GlobalTransform>, With<Listener>>, listener: Query<Option<&GlobalTransform>, With<Listener>>,
) { ) {
if let Ok(transform) = listener.get_single() { if let Ok(transform) = listener.single() {
let transform: Transform = transform let transform: Transform = transform
.map(|v| { .map(|v| {
let transform: Transform = (*v).into(); let transform: Transform = (*v).into();
@ -272,9 +272,9 @@ fn add_source_handle(
fn add_generator( fn add_generator(
context: Res<Context>, context: Res<Context>,
buffers: Res<Assets<Buffer>>, buffers: Res<Assets<Buffer>>,
mut query: Query<(Entity, Option<&Parent>, &mut Sound)>, mut query: Query<(Entity, Option<&ChildOf>, &mut Sound)>,
mut sources: Query<&mut Source>, mut sources: Query<&mut Source>,
parents: Query<&Parent>, parents: Query<&ChildOf>,
) { ) {
for (entity, parent, mut sound) in &mut query { for (entity, parent, mut sound) in &mut query {
if sound.generator.is_some() { if sound.generator.is_some() {
@ -286,11 +286,11 @@ fn add_generator(
let mut parent = parent; let mut parent = parent;
let mut target = None; let mut target = None;
while let Some(p) = parent { while let Some(p) = parent {
if sources.get(**p).is_ok() { if sources.get(p.parent()).is_ok() {
target = Some(**p); target = Some(p.parent());
break; break;
} }
parent = parents.get(**p).ok(); parent = parents.get(p.parent()).ok();
} }
target.map(|v| sources.get_mut(v).unwrap()) target.map(|v| sources.get_mut(v).unwrap())
} else { } else {
@ -341,7 +341,7 @@ fn add_generator(
fn add_sound_without_source( fn add_sound_without_source(
mut commands: Commands, mut commands: Commands,
query: Query<Entity, (Added<Sound>, Without<Source>)>, query: Query<Entity, (Added<Sound>, Without<Source>)>,
parents: Query<(&Parent, Option<&Source>)>, parents: Query<(&ChildOf, Option<&Source>)>,
) { ) {
for entity in &query { for entity in &query {
let mut has_source = false; let mut has_source = false;
@ -351,7 +351,7 @@ fn add_sound_without_source(
has_source = true; has_source = true;
break; break;
} }
target = **parent; target = parent.parent();
} }
if !has_source { if !has_source {
commands.entity(entity).insert(Source::default()); commands.entity(entity).insert(Source::default());
@ -709,10 +709,10 @@ fn events(
if *generator.handle() == event.source { if *generator.handle() == event.source {
match event.r#type { match event.r#type {
syz::EventType::Finished => { syz::EventType::Finished => {
output.send(SynthizerEvent::Finished(entity)); output.write(SynthizerEvent::Finished(entity));
} }
syz::EventType::Looped => { syz::EventType::Looped => {
output.send(SynthizerEvent::Looped(entity)); output.write(SynthizerEvent::Looped(entity));
} }
_ => {} _ => {}
} }