add glam-31 feature

Author: BillyDM

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
 
       - name: Check no_std build
         run: |
-          cargo build --locked --no-default-features --features "libm, scheduled_events, musical_transport, all_nodes_no_std, pool"
+          cargo build --locked --no-default-features --features "libm, scheduled_events, musical_transport, all_nodes_no_std, pool, glam-29, glam-30, glam-31"
 
   # Check formatting.
   format:

Cargo.toml

@@ -135,6 +135,8 @@ wasm-bindgen = ["firewheel-cpal/wasm-bindgen"]
 glam-29 = ["firewheel-core/glam-29"]
 # Enables `glam::Vec2` and `glam::Vec3` parameter derives for glam 0.30.
 glam-30 = ["firewheel-core/glam-30"]
+# Enables `glam::Vec2` and `glam::Vec3` parameter derives for glam 0.31.
+glam-31 = ["firewheel-core/glam-31"]
 # Enables the `MIDI` event type, using the `wmidi` crate.
 midi_events = ["firewheel-core/midi_events"]
 # Enables serde derives for types

crates/firewheel-core/Cargo.toml

@@ -46,16 +46,22 @@ std = [
     "bevy_reflect?/std",
     "glam-29?/std",
     "glam-30?/std",
+    "glam-31?/std",
     "portable-atomic/std",
     "num-traits/std",
     "thiserror/std",
     "thunderdome/std",
     "ringbuf/std",
     "wmidi?/std",
-    "rtgc/std"
+    "rtgc/std",
 ]
 # Enable this if "std" is disabled.
-libm = ["num-traits/libm"]
+libm = [
+    "num-traits/libm",
+    "glam-29?/nostd-libm",
+    "glam-30?/nostd-libm",
+    "glam-31?/nostd-libm"
+]
 # Enables scheduling events for audio nodes.
 #
 # NOTE TO THIRD PARTY NODE DEVELOPERS: Please keep this feature disabled
@@ -84,6 +90,8 @@ bevy_reflect = ["dep:bevy_reflect"]
 glam-29 = ["dep:glam-29"]
 # Enables `glam::Vec2` and `glam::Vec3` parameter derives for glam 0.30.
 glam-30 = ["dep:glam-30"]
+# Enables `glam::Vec2` and `glam::Vec3` parameter derives for glam 0.31.
+glam-31 = ["dep:glam-31"]
 # Enables the `MIDI` event type, using the `wmidi` crate.
 midi_events = ["dep:wmidi"]
 # Enables serde derives for types
@@ -103,6 +111,7 @@ bevy_ecs = { workspace = true, optional = true }
 bevy_reflect = { workspace = true, optional = true }
 glam-29 = { package = "glam", version = "0.29", default-features = false, optional = true }
 glam-30 = { package = "glam", version = "0.30", default-features = false, optional = true }
+glam-31 = { package = "glam", version = "0.31", 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",

crates/firewheel-core/src/vector.rs

@@ -138,3 +138,31 @@ impl From<Vec3> for glam_30::Vec3 {
         Self::new(value.x, value.y, value.z)
     }
 }
+
+#[cfg(feature = "glam-31")]
+impl From<glam_31::Vec2> for Vec2 {
+    fn from(value: glam_31::Vec2) -> Self {
+        Self::new(value.x, value.y)
+    }
+}
+
+#[cfg(feature = "glam-31")]
+impl From<glam_31::Vec3> for Vec3 {
+    fn from(value: glam_31::Vec3) -> Self {
+        Self::new(value.x, value.y, value.z)
+    }
+}
+
+#[cfg(feature = "glam-31")]
+impl From<Vec2> for glam_31::Vec2 {
+    fn from(value: Vec2) -> Self {
+        Self::new(value.x, value.y)
+    }
+}
+
+#[cfg(feature = "glam-31")]
+impl From<Vec3> for glam_31::Vec3 {
+    fn from(value: Vec3) -> Self {
+        Self::new(value.x, value.y, value.z)
+    }
+}