From 980dd68e6870fb85de575eed51ccab95dadcd352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Crozet?= <sebcrozet@dimforge.com>
Date: Mon, 19 Feb 2024 10:53:08 +0100
Subject: [PATCH] Support Glam 0.25 type conversion

---
 CHANGELOG.md                     |  3 +++
 Cargo.toml                       |  2 ++
 src/third_party/glam/mod.rs      |  2 ++
 src/third_party/glam/v025/mod.rs | 18 ++++++++++++++++++
 4 files changed, 25 insertions(+)
 create mode 100644 src/third_party/glam/v025/mod.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b73ea701..e5b81265 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ documented here.
 
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+## [0.32.4] (19 Feb 2023)
+- Add the `glam-0.25` feature to enable conversion from/to types from `glam` v0.25.
+
 ## [0.32.3] (09 July 2023)
 
 ### Modified
diff --git a/Cargo.toml b/Cargo.toml
index 8e4a8cc9..7efa660d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,6 +49,7 @@ convert-glam021 = [ "glam021" ]
 convert-glam022 = [ "glam022" ]
 convert-glam023 = [ "glam023" ]
 convert-glam024 = [ "glam024" ]
+convert-glam025 = [ "glam025" ]
 
 # Serialization
 ## To use serde in a #[no-std] environment, enable the
@@ -104,6 +105,7 @@ glam021        = { package = "glam", version = "0.21", optional = true }
 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 }
 cust_core      = { version = "0.1", optional = true }
 rayon          = { version = "1.6", optional = true }
 
diff --git a/src/third_party/glam/mod.rs b/src/third_party/glam/mod.rs
index b868817a..680e65e5 100644
--- a/src/third_party/glam/mod.rs
+++ b/src/third_party/glam/mod.rs
@@ -20,3 +20,5 @@ mod v022;
 mod v023;
 #[cfg(feature = "glam024")]
 mod v024;
+#[cfg(feature = "glam025")]
+mod v025;
diff --git a/src/third_party/glam/v025/mod.rs b/src/third_party/glam/v025/mod.rs
new file mode 100644
index 00000000..b9f41e34
--- /dev/null
+++ b/src/third_party/glam/v025/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 glam025 as glam;