From bd9e0fb72cc87f04c2ea2b87ab7a492f575ecb4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Crozet?= <developer@crozet.re>
Date: Sun, 8 Aug 2021 12:37:02 +0200
Subject: [PATCH 1/2] Add support for conversion with glam 0.16 and 0.17

---
 Cargo.toml                       |  4 ++++
 src/third_party/glam/mod.rs      |  4 ++++
 src/third_party/glam/v016/mod.rs | 18 ++++++++++++++++++
 src/third_party/glam/v017/mod.rs | 18 ++++++++++++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 src/third_party/glam/v016/mod.rs
 create mode 100644 src/third_party/glam/v017/mod.rs

diff --git a/Cargo.toml b/Cargo.toml
index 04550bdc..1fc51c56 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,6 +39,8 @@ convert-bytemuck = [ "bytemuck" ]
 convert-glam013 = [ "glam013" ]
 convert-glam014 = [ "glam014" ]
 convert-glam015 = [ "glam015" ]
+convert-glam016 = [ "glam016" ]
+convert-glam017 = [ "glam017" ]
 
 # Serialization
 ## To use serde in a #[no-std] environment, enable the
@@ -87,6 +89,8 @@ proptest           = { version = "1", optional = true, default-features = false,
 glam013        = { package = "glam", version = "0.13", optional = true }
 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 }
 
 
 [dev-dependencies]
diff --git a/src/third_party/glam/mod.rs b/src/third_party/glam/mod.rs
index a09e37ca..9d458db6 100644
--- a/src/third_party/glam/mod.rs
+++ b/src/third_party/glam/mod.rs
@@ -4,3 +4,7 @@ mod v013;
 mod v014;
 #[cfg(feature = "glam015")]
 mod v015;
+#[cfg(feature = "glam016")]
+mod v016;
+#[cfg(feature = "glam017")]
+mod v017;
diff --git a/src/third_party/glam/v016/mod.rs b/src/third_party/glam/v016/mod.rs
new file mode 100644
index 00000000..b5f36752
--- /dev/null
+++ b/src/third_party/glam/v016/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 glam016 as glam;
diff --git a/src/third_party/glam/v017/mod.rs b/src/third_party/glam/v017/mod.rs
new file mode 100644
index 00000000..6a0b345b
--- /dev/null
+++ b/src/third_party/glam/v017/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 glam017 as glam;

From 154579cd20836fab8c09d71ffd1d39a2b3a682d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Crozet?= <developer@crozet.re>
Date: Sun, 8 Aug 2021 17:50:47 +0200
Subject: [PATCH 2/2] More Changelog update.

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b5ace31..a55a6a5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,9 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   `Transform ÷= UnitComplex`.
 - Added `Reflection::bias()` to retrieve the bias of the reflection.
 - Added `Reflection1..Reflection6` aliases for 1D to 6D reflections.
+- Added implementation of `From` and `Into` for converting between `nalgebra` types and types from
+  `glam 0.16` and `glam 0.17`. These can be enabled by enabling the `convert-glam016`, and/or `convert-glam017`
+  cargo features.
 
 ## [0.28.0]
 ### Added