From 171e92bc202424294ea4cd1c5105c9149522dd8b Mon Sep 17 00:00:00 2001 From: Edgar Geier Date: Mon, 6 Mar 2023 23:39:38 +0100 Subject: [PATCH 1/3] Remove unnecessary parentheses --- src/linalg/convolution.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/linalg/convolution.rs b/src/linalg/convolution.rs index 2402bb3d..b0abe994 100644 --- a/src/linalg/convolution.rs +++ b/src/linalg/convolution.rs @@ -47,11 +47,11 @@ impl> Vector { 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(); } } } From 24dab117112dbf33478304993b77d2a6752ca72a Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Mon, 27 Feb 2023 11:22:27 +0100 Subject: [PATCH 2/3] Support conversion for glam 0.23 --- Cargo.toml | 2 ++ src/third_party/glam/mod.rs | 2 ++ src/third_party/glam/v023/mod.rs | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 src/third_party/glam/v023/mod.rs diff --git a/Cargo.toml b/Cargo.toml index 47895b58..bcc8f0cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 } diff --git a/src/third_party/glam/mod.rs b/src/third_party/glam/mod.rs index 811e88b2..8c250bbf 100644 --- a/src/third_party/glam/mod.rs +++ b/src/third_party/glam/mod.rs @@ -16,3 +16,5 @@ mod v020; mod v021; #[cfg(feature = "glam022")] mod v022; +#[cfg(feature = "glam023")] +mod v023; diff --git a/src/third_party/glam/v023/mod.rs b/src/third_party/glam/v023/mod.rs new file mode 100644 index 00000000..45b1ad47 --- /dev/null +++ b/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; From 4a5183ae590ba17a28803480b911eabb1690f461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Crozet?= Date: Tue, 7 Mar 2023 10:13:14 +0100 Subject: [PATCH 3/3] Release v0.32.2 --- CHANGELOG.md | 6 ++++++ Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90e304a2..cf0253aa 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/Cargo.toml b/Cargo.toml index bcc8f0cd..1d36aeb1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nalgebra" -version = "0.32.1" +version = "0.32.2" authors = [ "Sébastien Crozet " ] description = "General-purpose linear algebra library with transformations and statically-sized or dynamically-sized matrices."