diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43407f9b..5353eb33 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: - name: Check no_std build run: | - cargo build --locked --no-default-features --features "libm, scheduled_events, musical_transport, all_nodes_no_std, node_profiling, glam-29, glam-30, glam-31" + cargo build --locked --no-default-features --features "libm, scheduled_events, musical_transport, all_nodes_no_std, node_profiling, glam-29, glam-30, glam-31, glam-32, glam-33" # Check formatting. format: diff --git a/Cargo.toml b/Cargo.toml index f09d3ae0..96f8c26b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "firewheel" -version = "0.14.0" +version = "0.15.0" description = "An open source audio graph engine for games and other applications" repository.workspace = true edition.workspace = true @@ -28,7 +28,7 @@ default = ["std", "cpal", "symphonium", "sampler_node", "tracing"] std = [ "firewheel-core/std", "firewheel-graph/std", - "firewheel-nodes/std", + "firewheel-nodes/std" ] # Enable this if "std" is disabled. libm = ["firewheel-core/libm", "firewheel-nodes/libm"] @@ -86,7 +86,7 @@ peak_meter_node = ["firewheel-nodes/peak_meter"] sampler_node = ["firewheel-nodes/sampler"] # Enables the basic 3D spatial positioning node spatial_basic_node = [ - "firewheel-nodes/spatial_basic", + "firewheel-nodes/spatial_basic" ] # Enables the triple buffer node for sending raw audio data from the # audio graph to another thread. Useful for cases where you only care @@ -126,6 +126,8 @@ glam-30 = ["firewheel-core/glam-30"] glam-31 = ["firewheel-core/glam-31"] # Enables `glam::Vec2` and `glam::Vec3` parameter derives for glam 0.32. glam-32 = ["firewheel-core/glam-32"] +# Enables `glam::Vec2` and `glam::Vec3` parameter derives for glam 0.33. +glam-33 = ["firewheel-core/glam-33"] # Enables the `MIDI` event type, using the `wmidi` crate. midi_events = ["firewheel-core/midi_events"] # Enables serde derives for types @@ -191,14 +193,16 @@ smallvec = "1" arrayvec = { version = "0.7", default-features = false } bitflags = "2" thunderdome = { version = "0.6", default-features = false } -firewheel-macros = { path = "crates/firewheel-macros", version = "0.14.0" } -bevy_platform = { version = "0.19.0", default-features = false, features = [ +firewheel-macros = { path = "crates/firewheel-macros", version = "0.15.0" } +bevy_platform = { version = "0.20.0", default-features = false, features = [ "alloc", ] } -bevy_ecs = { version = "0.19.0", default-features = false } -bevy_reflect = { version = "0.19.0", default-features = false } +bevy_ecs = { version = "0.20.0", default-features = false } +bevy_reflect = { version = "0.20.0", default-features = false } fixed-resample = { version = "0.13.0", default-features = false } -symphonium = { version = "0.13.0", default-features = false, features = ["decode-native"] } +symphonium = { version = "0.13.0", default-features = false, features = [ + "decode-native", +] } num-traits = { version = "0.2", default-features = false } audioadapter = { version = "5.0", default-features = false } audioadapter-buffers = { version = "5.0", default-features = false } @@ -213,12 +217,12 @@ eframe = { version = "0.33.3", default-features = false, features = [ ] } [dependencies] -firewheel-core = { path = "crates/firewheel-core", version = "0.14.0", default-features = false } -firewheel-graph = { path = "crates/firewheel-graph", version = "0.14.0", default-features = false } -firewheel-cpal = { path = "crates/firewheel-cpal", version = "0.14.0", default-features = false, optional = true } -firewheel-nodes = { path = "crates/firewheel-nodes", version = "0.14.0", default-features = false } -firewheel-symphonium = { path = "crates/firewheel-symphonium", version = "0.14.0", default-features = false, optional = true } -firewheel-rtaudio = { path = "crates/firewheel-rtaudio", version = "0.14.0", default-features = false, optional = true } +firewheel-core = { path = "crates/firewheel-core", version = "0.15.0", default-features = false } +firewheel-graph = { path = "crates/firewheel-graph", version = "0.15.0", default-features = false } +firewheel-cpal = { path = "crates/firewheel-cpal", version = "0.15.0", default-features = false, optional = true } +firewheel-nodes = { path = "crates/firewheel-nodes", version = "0.15.0", default-features = false } +firewheel-symphonium = { path = "crates/firewheel-symphonium", version = "0.15.0", default-features = false, optional = true } +firewheel-rtaudio = { path = "crates/firewheel-rtaudio", version = "0.15.0", default-features = false, optional = true } thunderdome = { workspace = true, optional = true } smallvec = { workspace = true, optional = true } thiserror.workspace = true diff --git a/crates/firewheel-core/Cargo.toml b/crates/firewheel-core/Cargo.toml index 3749e193..0301f0cb 100644 --- a/crates/firewheel-core/Cargo.toml +++ b/crates/firewheel-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "firewheel-core" -version = "0.14.0" +version = "0.15.0" description = "Shared types for Firewheel crates" homepage = "https://github.com/BillyDM/firewheel/blob/main/crates/firewheel-core" repository.workspace = true @@ -48,6 +48,7 @@ std = [ "glam-30?/std", "glam-31?/std", "glam-32?/std", + "glam-33?/std", "portable-atomic/std", "num-traits/std", "thiserror/std", @@ -55,7 +56,7 @@ std = [ "ringbuf/std", "wmidi?/std", "audioadapter-buffers/std", - "audioadapter-sample/std" + "audioadapter-sample/std", ] # Enable this if "std" is disabled. libm = [ @@ -63,7 +64,8 @@ libm = [ "glam-29?/nostd-libm", "glam-30?/nostd-libm", "glam-31?/nostd-libm", - "glam-32?/nostd-libm" + "glam-32?/nostd-libm", + "glam-33?/nostd-libm", ] # Enables scheduling events for audio nodes. # @@ -97,6 +99,8 @@ glam-30 = ["dep:glam-30"] glam-31 = ["dep:glam-31"] # Enables `glam::Vec2` and `glam::Vec3` parameter derives for glam 0.32. glam-32 = ["dep:glam-32"] +# Enables `glam::Vec2` and `glam::Vec3` parameter derives for glam 0.33. +glam-33 = ["dep:glam-33"] # Enables the `MIDI` event type, using the `wmidi` crate. midi_events = ["dep:wmidi"] # Enables serde derives for types @@ -121,6 +125,7 @@ glam-29 = { package = "glam", version = "0.29", default-features = false, option glam-30 = { package = "glam", version = "0.30", default-features = false, optional = true } glam-31 = { package = "glam", version = "0.31", default-features = false, optional = true } glam-32 = { package = "glam", version = "0.32", default-features = false, optional = true } +glam-33 = { package = "glam", version = "0.33", default-features = false, optional = true } # TODO: Remove this once `bevy_platform` exposes the atomic float types from `portable-atomic`. portable-atomic = { version = "1", default-features = false, features = [ "fallback", diff --git a/crates/firewheel-core/src/diff/leaf.rs b/crates/firewheel-core/src/diff/leaf.rs index c9e0c3f6..13cde446 100644 --- a/crates/firewheel-core/src/diff/leaf.rs +++ b/crates/firewheel-core/src/diff/leaf.rs @@ -183,6 +183,11 @@ primitive_diff!(glam_32::Vec2, Vector2D); #[cfg(feature = "glam-32")] primitive_diff!(glam_32::Vec3, Vector3D); +#[cfg(feature = "glam-33")] +primitive_diff!(glam_33::Vec2, Vector2D); +#[cfg(feature = "glam-33")] +primitive_diff!(glam_33::Vec3, Vector3D); + impl Diff for ArcGc { fn diff(&self, baseline: &Self, path: PathBuilder, event_queue: &mut E) { if !ArcGc::ptr_eq(self, baseline) { @@ -402,3 +407,8 @@ non_trivial_notify!(glam_31::Vec3); non_trivial_notify!(glam_32::Vec2); #[cfg(feature = "glam-32")] non_trivial_notify!(glam_32::Vec3); + +#[cfg(feature = "glam-33")] +non_trivial_notify!(glam_33::Vec2); +#[cfg(feature = "glam-33")] +non_trivial_notify!(glam_33::Vec3); diff --git a/crates/firewheel-core/src/diff/notify.rs b/crates/firewheel-core/src/diff/notify.rs index 73cf8f47..1f631fbe 100644 --- a/crates/firewheel-core/src/diff/notify.rs +++ b/crates/firewheel-core/src/diff/notify.rs @@ -259,14 +259,15 @@ mod reflect { { fn get_type_registration() -> bevy_reflect::TypeRegistration { let mut registration = bevy_reflect::TypeRegistration::of::(); - registration.insert:: (bevy_reflect::FromType:: ::from_type()); + registration.insert::( + bevy_reflect::CreateTypeData::::create_type_data(()), + ); registration.insert::( - bevy_reflect::FromType::::from_type(), + bevy_reflect::CreateTypeData::::create_type_data(()), + ); + registration.insert::( + bevy_reflect::CreateTypeData::::create_type_data(()), ); - registration - .insert::( - bevy_reflect::FromType::::from_type(), - ); registration } @@ -453,16 +454,18 @@ mod reflect { bevy_reflect::structs::FieldIter::new(self) } - fn to_dynamic_struct(&self) -> bevy_reflect::structs::DynamicStruct { + fn to_dynamic_struct( + &self, + ) -> Result { let mut dynamic: bevy_reflect::structs::DynamicStruct = Default::default(); dynamic.set_represented_type(bevy_reflect::PartialReflect::get_represented_type_info( self, )); dynamic.insert_boxed( "value", - bevy_reflect::PartialReflect::to_dynamic(&self.value), + bevy_reflect::PartialReflect::to_dynamic(&self.value)?, ); - dynamic + Ok(dynamic) } fn index_of_name(&self, name: &str) -> Option { diff --git a/crates/firewheel-core/src/event.rs b/crates/firewheel-core/src/event.rs index 803656f9..dba6d2da 100644 --- a/crates/firewheel-core/src/event.rs +++ b/crates/firewheel-core/src/event.rs @@ -346,6 +346,11 @@ param_data_from!(glam_32::Vec2, Vector2D); #[cfg(feature = "glam-32")] param_data_from!(glam_32::Vec3, Vector3D); +#[cfg(feature = "glam-33")] +param_data_from!(glam_33::Vec2, Vector2D); +#[cfg(feature = "glam-33")] +param_data_from!(glam_33::Vec3, Vector3D); + impl From<()> for ParamData { fn from(_value: ()) -> Self { Self::None diff --git a/crates/firewheel-core/src/vector.rs b/crates/firewheel-core/src/vector.rs index 54d69068..847dbeb7 100644 --- a/crates/firewheel-core/src/vector.rs +++ b/crates/firewheel-core/src/vector.rs @@ -194,3 +194,31 @@ impl From for glam_32::Vec3 { Self::new(value.x, value.y, value.z) } } + +#[cfg(feature = "glam-33")] +impl From for Vec2 { + fn from(value: glam_33::Vec2) -> Self { + Self::new(value.x, value.y) + } +} + +#[cfg(feature = "glam-33")] +impl From for Vec3 { + fn from(value: glam_33::Vec3) -> Self { + Self::new(value.x, value.y, value.z) + } +} + +#[cfg(feature = "glam-33")] +impl From for glam_33::Vec2 { + fn from(value: Vec2) -> Self { + Self::new(value.x, value.y) + } +} + +#[cfg(feature = "glam-33")] +impl From for glam_33::Vec3 { + fn from(value: Vec3) -> Self { + Self::new(value.x, value.y, value.z) + } +} diff --git a/crates/firewheel-cpal/Cargo.toml b/crates/firewheel-cpal/Cargo.toml index b563c8ea..9f1f915c 100644 --- a/crates/firewheel-cpal/Cargo.toml +++ b/crates/firewheel-cpal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "firewheel-cpal" -version = "0.14.0" +version = "0.15.0" description = "cpal backend for Firewheel" homepage = "https://github.com/BillyDM/firewheel/blob/main/crates/firewheel-cpal" repository.workspace = true @@ -25,8 +25,8 @@ tracing = ["dep:tracing"] log = ["dep:log"] [dependencies] -firewheel-core = { path = "../firewheel-core", version = "0.14.0", default-features = false, features = ["std"] } -firewheel-graph = { path = "../firewheel-graph", version = "0.14.0", default-features = false, features = ["std"] } +firewheel-core = { path = "../firewheel-core", version = "0.15.0", default-features = false, features = ["std"] } +firewheel-graph = { path = "../firewheel-graph", version = "0.15.0", default-features = false, features = ["std"] } cpal = "0.18.2" tracing = { workspace = true, optional = true } log = { workspace = true, optional = true } diff --git a/crates/firewheel-graph/Cargo.toml b/crates/firewheel-graph/Cargo.toml index cb2b202b..af3e36ae 100644 --- a/crates/firewheel-graph/Cargo.toml +++ b/crates/firewheel-graph/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "firewheel-graph" -version = "0.14.1" +version = "0.15.0" description = "Core audio graph algorithm and executor for Firewheel" homepage = "https://github.com/BillyDM/firewheel/blob/main/crates/firewheel-graph" repository.workspace = true @@ -66,7 +66,7 @@ unsafe_flush_denormals_to_zero = [] wasm-bindgen = ["dep:wasm-bindgen"] [dependencies] -firewheel-core = { path = "../firewheel-core", version = "0.14.0", default-features = false } +firewheel-core = { path = "../firewheel-core", version = "0.15.0", default-features = false } tracing = { workspace = true, optional = true } log = { workspace = true, optional = true } ringbuf.workspace = true diff --git a/crates/firewheel-macros/Cargo.toml b/crates/firewheel-macros/Cargo.toml index b4aa53b7..23d8b124 100644 --- a/crates/firewheel-macros/Cargo.toml +++ b/crates/firewheel-macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "firewheel-macros" -version = "0.14.0" +version = "0.15.0" description = "Macros for Firewheel crates" homepage = "https://github.com/BillyDM/firewheel/blob/main/crates/firewheel-macros" repository.workspace = true diff --git a/crates/firewheel-nodes/Cargo.toml b/crates/firewheel-nodes/Cargo.toml index 6970a627..baa9bb0b 100644 --- a/crates/firewheel-nodes/Cargo.toml +++ b/crates/firewheel-nodes/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "firewheel-nodes" -version = "0.14.0" +version = "0.15.0" description = "Official factory nodes for the Firewheel audio engine" homepage = "https://github.com/BillyDM/firewheel/blob/main/crates/firewheel-nodes" repository.workspace = true @@ -95,7 +95,7 @@ bevy_reflect = ["dep:bevy_reflect", "firewheel-core/bevy_reflect"] serde = ["dep:serde", "firewheel-core/serde"] [dependencies] -firewheel-core = { path = "../firewheel-core", version = "0.14.0", default-features = false } +firewheel-core = { path = "../firewheel-core", version = "0.15.0", default-features = false } bevy_platform.workspace = true num-traits.workspace = true smallvec = { workspace = true, optional = true } diff --git a/crates/firewheel-rtaudio/Cargo.toml b/crates/firewheel-rtaudio/Cargo.toml index f5ecf0e6..499897f8 100644 --- a/crates/firewheel-rtaudio/Cargo.toml +++ b/crates/firewheel-rtaudio/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "firewheel-rtaudio" -version = "0.14.0" +version = "0.15.0" description = "RtAudio backend for Firewheel" homepage = "https://github.com/BillyDM/firewheel/blob/main/crates/firewheel-rtaudio" edition.workspace = true @@ -25,8 +25,8 @@ log = ["dep:log", "rtaudio/log"] serde = ["dep:serde", "rtaudio/serde"] [dependencies] -firewheel-core = { path = "../firewheel-core", version = "0.14.0", default-features = false, features = ["std"] } -firewheel-graph = { path = "../firewheel-graph", version = "0.14.0", default-features = false, features = ["std"] } +firewheel-core = { path = "../firewheel-core", version = "0.15.0", default-features = false, features = ["std"] } +firewheel-graph = { path = "../firewheel-graph", version = "0.15.0", default-features = false, features = ["std"] } thiserror.workspace = true tracing = { workspace = true, optional = true } log = { workspace = true, optional = true } diff --git a/crates/firewheel-symphonium/Cargo.toml b/crates/firewheel-symphonium/Cargo.toml index 475c6925..2f845f30 100644 --- a/crates/firewheel-symphonium/Cargo.toml +++ b/crates/firewheel-symphonium/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "firewheel-symphonium" -version = "0.14.0" +version = "0.15.0" description = "Symphonium integration for Firewheel" homepage = "https://github.com/BillyDM/firewheel/blob/main/crates/firewheel-symphonium" edition.workspace = true @@ -19,6 +19,6 @@ tracing = ["symphonium/tracing"] log = ["symphonium/log"] [dependencies] -firewheel-core = { path = "../firewheel-core", version = "0.14.0", default-features = false, features = ["std"] } +firewheel-core = { path = "../firewheel-core", version = "0.15.0", default-features = false, features = ["std"] } symphonium.workspace = true bevy_platform.workspace = true