From cd6846428a47c8b7695c9cc58416c20acb33c346 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 20 Aug 2024 19:38:42 +0700 Subject: [PATCH] Support conversion for glam 0.29 --- CHANGELOG.md | 6 ++++++ Cargo.toml | 2 ++ src/third_party/glam/mod.rs | 2 ++ src/third_party/glam/v029/mod.rs | 18 ++++++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 src/third_party/glam/v029/mod.rs diff --git a/CHANGELOG.md b/CHANGELOG.md index b2d35aa69..6aef057b3 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 `glam-0.29` feature to enable conversion from/to types from `glam` v0.29. + ## [0.33.1] (16 October 2024) ### Added diff --git a/Cargo.toml b/Cargo.toml index 7ff7b1bbf..7e1809d26 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,6 +50,7 @@ convert-glam024 = ["glam024"] convert-glam025 = ["glam025"] convert-glam027 = ["glam027"] convert-glam028 = ["glam028"] +convert-glam029 = ["glam029"] # Serialization ## To use serde in a #[no-std] environment, enable the @@ -108,6 +109,7 @@ glam024 = { package = "glam", version = "0.24", optional = true } 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 } 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 f404df696..cccafb0a8 100644 --- a/src/third_party/glam/mod.rs +++ b/src/third_party/glam/mod.rs @@ -26,3 +26,5 @@ mod v025; mod v027; #[cfg(feature = "glam028")] mod v028; +#[cfg(feature = "glam029")] +mod v029; diff --git a/src/third_party/glam/v029/mod.rs b/src/third_party/glam/v029/mod.rs new file mode 100644 index 000000000..a0f0c398c --- /dev/null +++ b/src/third_party/glam/v029/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 glam029 as glam;