From 03d00a75789e98aede15895c67944dbb6763ba24 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 19 Feb 2025 12:58:17 +0700 Subject: [PATCH] Support conversion for glam 0.30 --- CHANGELOG.md | 6 ++++++ Cargo.toml | 2 ++ src/third_party/glam/mod.rs | 2 ++ src/third_party/glam/v030/mod.rs | 18 ++++++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 src/third_party/glam/v030/mod.rs diff --git a/CHANGELOG.md b/CHANGELOG.md index b78422b97..d2afdc017 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ documented here. This project adheres to [Semantic Versioning](https://semver.org/). +## [Unreleased] (?) + +### Added + +- Add the `convert-glam030` feature to enable conversion from/to types from `glam` v0.30. + ## [0.33.2] (29 October 2024) ### Added diff --git a/Cargo.toml b/Cargo.toml index b2f90ec55..a7cc029bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,6 +51,7 @@ convert-glam025 = ["glam025"] convert-glam027 = ["glam027"] convert-glam028 = ["glam028"] convert-glam029 = ["glam029"] +convert-glam030 = ["glam030"] # Serialization ## To use serde in a #[no-std] environment, enable the @@ -110,6 +111,7 @@ glam025 = { package = "glam", version = "0.25", optional = true } glam027 = { package = "glam", version = "0.27", optional = true } glam028 = { package = "glam", version = "0.28", optional = true } glam029 = { package = "glam", version = "0.29", optional = true } +glam030 = { package = "glam", version = "0.30", optional = true } rayon = { version = "1.6", optional = true } [dev-dependencies] diff --git a/src/third_party/glam/mod.rs b/src/third_party/glam/mod.rs index cccafb0a8..8bc98b28b 100644 --- a/src/third_party/glam/mod.rs +++ b/src/third_party/glam/mod.rs @@ -28,3 +28,5 @@ mod v027; mod v028; #[cfg(feature = "glam029")] mod v029; +#[cfg(feature = "glam030")] +mod v030; diff --git a/src/third_party/glam/v030/mod.rs b/src/third_party/glam/v030/mod.rs new file mode 100644 index 000000000..a2eca9703 --- /dev/null +++ b/src/third_party/glam/v030/mod.rs @@ -0,0 +1,18 @@ +#[path = "../common/glam_isometry.rs"] +mod glam_isometry; +#[path = "../common/glam_matrix.rs"] +mod glam_matrix; +#[path = "../common/glam_point.rs"] +mod glam_point; +#[path = "../common/glam_quaternion.rs"] +mod glam_quaternion; +#[path = "../common/glam_rotation.rs"] +mod glam_rotation; +#[path = "../common/glam_similarity.rs"] +mod glam_similarity; +#[path = "../common/glam_translation.rs"] +mod glam_translation; +#[path = "../common/glam_unit_complex.rs"] +mod glam_unit_complex; + +pub(self) use glam030 as glam;