From 87a6f4965bcc196454eb095e69ba10c10fe0c660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Crozet?= Date: Sun, 9 Jan 2022 13:43:45 +0100 Subject: [PATCH] Add support for conversion with glam 0.19 and 0.20 --- Cargo.toml | 4 ++++ src/third_party/glam/mod.rs | 4 ++++ src/third_party/glam/v019/mod.rs | 18 ++++++++++++++++++ src/third_party/glam/v020/mod.rs | 18 ++++++++++++++++++ 4 files changed, 44 insertions(+) create mode 100644 src/third_party/glam/v019/mod.rs create mode 100644 src/third_party/glam/v020/mod.rs diff --git a/Cargo.toml b/Cargo.toml index 8294398e8..4ecafc59c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,6 +43,8 @@ convert-glam015 = [ "glam015" ] convert-glam016 = [ "glam016" ] convert-glam017 = [ "glam017" ] convert-glam018 = [ "glam018" ] +convert-glam019 = [ "glam019" ] +convert-glam020 = [ "glam020" ] # Serialization ## To use serde in a #[no-std] environment, enable the @@ -94,6 +96,8 @@ glam015 = { package = "glam", version = "0.15", optional = true } glam016 = { package = "glam", version = "0.16", optional = true } glam017 = { package = "glam", version = "0.17", optional = true } glam018 = { package = "glam", version = "0.18", optional = true } +glam019 = { package = "glam", version = "0.19", optional = true } +glam020 = { package = "glam", version = "0.20", optional = true } [target.'cfg(not(target_os = "cuda"))'.dependencies] cust = { version = "0.2", optional = true } diff --git a/src/third_party/glam/mod.rs b/src/third_party/glam/mod.rs index b1006e914..d24ff7e54 100644 --- a/src/third_party/glam/mod.rs +++ b/src/third_party/glam/mod.rs @@ -10,3 +10,7 @@ mod v016; mod v017; #[cfg(feature = "glam018")] mod v018; +#[cfg(feature = "glam019")] +mod v019; +#[cfg(feature = "glam020")] +mod v020; diff --git a/src/third_party/glam/v019/mod.rs b/src/third_party/glam/v019/mod.rs new file mode 100644 index 000000000..8b155607f --- /dev/null +++ b/src/third_party/glam/v019/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 glam019 as glam; diff --git a/src/third_party/glam/v020/mod.rs b/src/third_party/glam/v020/mod.rs new file mode 100644 index 000000000..99fbc602f --- /dev/null +++ b/src/third_party/glam/v020/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 glam020 as glam;