Merge branch 'dimforge:dev' into dev

CHANGELOG.md

@@ -4,6 +4,12 @@ documented here.
 
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+
+## [0.32.2] (07 March 2023)
+
+### Added
+- Add the `glam-0.23` to enable conversion from/to type from `glam` v0.23. 
+
 ## [0.32.1] (14 Jan. 2023)
 
 ### Modified

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name    = "nalgebra"
-version = "0.32.1"
+version = "0.32.2"
 authors = [ "Sébastien Crozet <developer@crozet.re>" ]
 
 description = "General-purpose linear algebra library with transformations and statically-sized or dynamically-sized matrices."
@@ -47,6 +47,7 @@ convert-glam019 = [ "glam019" ]
 convert-glam020 = [ "glam020" ]
 convert-glam021 = [ "glam021" ]
 convert-glam022 = [ "glam022" ]
+convert-glam023 = [ "glam023" ]
 
 # Serialization
 ## To use serde in a #[no-std] environment, enable the
@@ -101,6 +102,7 @@ glam019        = { package = "glam", version = "0.19", optional = true }
 glam020        = { package = "glam", version = "0.20", optional = true }
 glam021        = { package = "glam", version = "0.21", optional = true }
 glam022        = { package = "glam", version = "0.22", optional = true }
+glam023        = { package = "glam", version = "0.23", optional = true }
 cust_core      = { version = "0.1", optional = true }
 rayon          = { version = "1.6", optional = true }
 

src/linalg/convolution.rs

@@ -47,11 +47,11 @@ impl<T: RealField, D1: Dim, S1: Storage<T, D1>> Vector<T, D1, S1> {
             let u_f = cmp::min(i, vec - 1);
 
             if u_i == u_f {
-                conv[i] += self[u_i].clone() * kernel[(i - u_i)].clone();
+                conv[i] += self[u_i].clone() * kernel[i - u_i].clone();
             } else {
                 for u in u_i..(u_f + 1) {
                     if i - u < ker {
-                        conv[i] += self[u].clone() * kernel[(i - u)].clone();
+                        conv[i] += self[u].clone() * kernel[i - u].clone();
                     }
                 }
             }

src/third_party/glam/mod.rs

@@ -16,3 +16,5 @@ mod v020;
 mod v021;
 #[cfg(feature = "glam022")]
 mod v022;
+#[cfg(feature = "glam023")]
+mod v023;

src/third_party/glam/v023/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 glam023 as glam;