From 645b80b860a8e454c7101621e593100b3aa2f846 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Fri, 10 May 2024 19:16:14 +0700 Subject: [PATCH] Support conversion for glam 0.27 --- CHANGELOG.md | 4 ++++ Cargo.toml | 2 ++ src/third_party/glam/mod.rs | 2 ++ src/third_party/glam/v027/mod.rs | 18 ++++++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 src/third_party/glam/v027/mod.rs diff --git a/CHANGELOG.md b/CHANGELOG.md index cc6d0a870..b7653bf52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ This project adheres to [Semantic Versioning](https://semver.org/). ## Unreleased +### Added + +- Add the `glam-0.27` feature to enable conversion from/to types from `glam` v0.27. + ### Removed - The `cuda` feature has been removed, as the toolchain it depends on diff --git a/Cargo.toml b/Cargo.toml index 2e31b1ec7..6dda5f328 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,6 +49,7 @@ convert-glam022 = [ "glam022" ] convert-glam023 = [ "glam023" ] convert-glam024 = [ "glam024" ] convert-glam025 = [ "glam025" ] +convert-glam027 = [ "glam027" ] # Serialization ## To use serde in a #[no-std] environment, enable the @@ -105,6 +106,7 @@ glam022 = { package = "glam", version = "0.22", optional = true } glam023 = { package = "glam", version = "0.23", optional = true } glam024 = { package = "glam", version = "0.24", optional = true } glam025 = { package = "glam", version = "0.25", optional = true } +glam027 = { package = "glam", version = "0.27", 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 680e65e5c..1abe7cda4 100644 --- a/src/third_party/glam/mod.rs +++ b/src/third_party/glam/mod.rs @@ -22,3 +22,5 @@ mod v023; mod v024; #[cfg(feature = "glam025")] mod v025; +#[cfg(feature = "glam027")] +mod v027; diff --git a/src/third_party/glam/v027/mod.rs b/src/third_party/glam/v027/mod.rs new file mode 100644 index 000000000..20cc06f95 --- /dev/null +++ b/src/third_party/glam/v027/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 glam027 as glam;