From bc21b6f1e67ea062769846bf1d7d2be034debc5a Mon Sep 17 00:00:00 2001
From: Edgar Geier <egeier@rhrk.uni-kl.de>
Date: Mon, 30 Aug 2021 18:31:21 +0200
Subject: [PATCH] Add support for conversion with glam 0.18

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cb2bb21..41c6921f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ### Added
 
 - The conversion trait `From<Vec<T>>` and method `from_vec_storage` for `RowDVector`. See [#975](https://github.com/dimforge/nalgebra/issues/975)
+- Added implementation of `From` and `Into` for converting between `nalgebra` types and types from
+  `glam 0.18`. These can be enabled by enabling the `convert-glam018` cargo features.
 
 ## [0.29.0]
 ### Breaking changes
diff --git a/Cargo.toml b/Cargo.toml
index 2b4a7487..f1e50ab9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,6 +41,7 @@ convert-glam014 = [ "glam014" ]
 convert-glam015 = [ "glam015" ]
 convert-glam016 = [ "glam016" ]
 convert-glam017 = [ "glam017" ]
+convert-glam018 = [ "glam018" ]
 
 # Serialization
 ## To use serde in a #[no-std] environment, enable the
@@ -91,6 +92,7 @@ glam014        = { package = "glam", version = "0.14", optional = true }
 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 }
 
 
 [dev-dependencies]
diff --git a/src/third_party/glam/mod.rs b/src/third_party/glam/mod.rs
index 9d458db6..b1006e91 100644
--- a/src/third_party/glam/mod.rs
+++ b/src/third_party/glam/mod.rs
@@ -8,3 +8,5 @@ mod v015;
 mod v016;
 #[cfg(feature = "glam017")]
 mod v017;
+#[cfg(feature = "glam018")]
+mod v018;
diff --git a/src/third_party/glam/v018/mod.rs b/src/third_party/glam/v018/mod.rs
new file mode 100644
index 00000000..7124fd82
--- /dev/null
+++ b/src/third_party/glam/v018/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 glam018 as glam;