Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
32 changes: 18 additions & 14 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"]
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 }
Expand All @@ -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
Expand Down
11 changes: 8 additions & 3 deletions crates/firewheel-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -48,22 +48,24 @@ std = [
"glam-30?/std",
"glam-31?/std",
"glam-32?/std",
"glam-33?/std",
"portable-atomic/std",
"num-traits/std",
"thiserror/std",
"thunderdome/std",
"ringbuf/std",
"wmidi?/std",
"audioadapter-buffers/std",
"audioadapter-sample/std"
"audioadapter-sample/std",
]
# Enable this if "std" is disabled.
libm = [
"num-traits/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.
#
Expand Down Expand Up @@ -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
Expand All @@ -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",
Expand Down
10 changes: 10 additions & 0 deletions crates/firewheel-core/src/diff/leaf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<A: ?Sized + Send + Sync + 'static> Diff for ArcGc<A> {
fn diff<E: EventQueue>(&self, baseline: &Self, path: PathBuilder, event_queue: &mut E) {
if !ArcGc::ptr_eq(self, baseline) {
Expand Down Expand Up @@ -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);
21 changes: 12 additions & 9 deletions crates/firewheel-core/src/diff/notify.rs
Original file line number Diff line number Diff line change
Expand Up @@ -259,14 +259,15 @@ mod reflect {
{
fn get_type_registration() -> bevy_reflect::TypeRegistration {
let mut registration = bevy_reflect::TypeRegistration::of::<Self>();
registration.insert:: <bevy_reflect::ReflectFromPtr>(bevy_reflect::FromType:: <Self> ::from_type());
registration.insert::<bevy_reflect::ReflectFromPtr>(
bevy_reflect::CreateTypeData::<Self>::create_type_data(()),
);
registration.insert::<bevy_reflect::ReflectFromReflect>(
bevy_reflect::FromType::<Self>::from_type(),
bevy_reflect::CreateTypeData::<Self>::create_type_data(()),
);
registration.insert::<bevy_reflect::prelude::ReflectDefault>(
bevy_reflect::CreateTypeData::<Self>::create_type_data(()),
);
registration
.insert::<bevy_reflect::prelude::ReflectDefault>(
bevy_reflect::FromType::<Self>::from_type(),
);
registration
}

Expand Down Expand Up @@ -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<bevy_reflect::structs::DynamicStruct, bevy_reflect::ReflectCloneError> {
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<usize> {
Expand Down
5 changes: 5 additions & 0 deletions crates/firewheel-core/src/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 28 additions & 0 deletions crates/firewheel-core/src/vector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -194,3 +194,31 @@ impl From<Vec3> for glam_32::Vec3 {
Self::new(value.x, value.y, value.z)
}
}

#[cfg(feature = "glam-33")]
impl From<glam_33::Vec2> for Vec2 {
fn from(value: glam_33::Vec2) -> Self {
Self::new(value.x, value.y)
}
}

#[cfg(feature = "glam-33")]
impl From<glam_33::Vec3> for Vec3 {
fn from(value: glam_33::Vec3) -> Self {
Self::new(value.x, value.y, value.z)
}
}

#[cfg(feature = "glam-33")]
impl From<Vec2> for glam_33::Vec2 {
fn from(value: Vec2) -> Self {
Self::new(value.x, value.y)
}
}

#[cfg(feature = "glam-33")]
impl From<Vec3> for glam_33::Vec3 {
fn from(value: Vec3) -> Self {
Self::new(value.x, value.y, value.z)
}
}
6 changes: 3 additions & 3 deletions crates/firewheel-cpal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 }
Expand Down
4 changes: 2 additions & 2 deletions crates/firewheel-graph/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crates/firewheel-macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions crates/firewheel-nodes/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 }
Expand Down
6 changes: 3 additions & 3 deletions crates/firewheel-rtaudio/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 }
Expand Down
4 changes: 2 additions & 2 deletions crates/firewheel-symphonium/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Loading