Skip to content

Commit 2d3786b

Browse files
committed
update to nalgebra 0.34
1 parent c5613c6 commit 2d3786b

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

Cargo.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ exclude = [
134134
debug = true
135135

136136
[workspace.dependencies]
137-
adskalman = "0.16"
137+
adskalman = "0.17"
138138
anyhow = "1"
139139
approx = "0.5"
140140
async-change-tracker = "0.3.4"
@@ -143,7 +143,7 @@ axum-token-auth = "0.2.0"
143143
base64 = "0.12"
144144
byteorder = "1"
145145
bytes = "1.6"
146-
cam-geom = { version = "0.15", features = ["serde-serialize"] }
146+
cam-geom = { version = "0.16", features = ["serde-serialize"] }
147147
camino = "1.1.9"
148148
cast = { version = "0.3", features = ["std"] }
149149
chrono = { version = "0.4", features = ["serde"] }
@@ -153,7 +153,7 @@ cookie_store = "0.21.0"
153153
csv = "1.1"
154154
convert-image = "0.1.3"
155155
delaunator = "1.0"
156-
dlt = "0.13"
156+
dlt = "0.14"
157157
dotenv = "0.15.0"
158158
dyn-clone = "1.0.11"
159159
env_logger = "0.11"
@@ -197,27 +197,27 @@ js-sys = "0.3.77"
197197
json-lines = { version = "0.1.0", features = ["codec"] }
198198
lazy_static = "1.4"
199199
less-avc = "0.1.4"
200-
levenberg-marquardt = "0.14.0"
200+
levenberg-marquardt = "0.15"
201201
libc = "0.2"
202202
libflate = "2.1.0"
203203
log = "0.4"
204-
lstsq = "0.6.0"
204+
lstsq = "0.7"
205205
machine-vision-formats = { version = "0.1.4", default-features = false }
206206
memchr = "2.7.2"
207207
mime = "0.3.17"
208208
mp4 = { git = "https://github.com/strawlab/mp4-rust", rev = "e6a68f68d3f662039ab28b2cc20c4c16134f2a8c" }
209-
nalgebra = { version = "0.33", features = ["serde-serialize"] }
210-
nalgebra-mvn = "0.15"
211-
ncollide2d = { package = "ncollide2d-updated", version = "0.36.3" }
212-
ncollide3d = { package = "ncollide3d-updated", version = "0.36.3" }
209+
nalgebra = { version = "0.34", features = ["serde-serialize"] }
210+
nalgebra-mvn = "0.16"
211+
ncollide2d = { package = "ncollide2d-updated", version = "0.37.1" }
212+
ncollide3d = { package = "ncollide3d-updated", version = "0.37.1" }
213213
num-iter = "0.1"
214214
num-traits = "0.2"
215215
obj = { version = "0.10", features = ["genmesh"] }
216-
opencv-ros-camera = { version = "0.15.1", features = ["serde-serialize"] }
216+
opencv-ros-camera = { version = "0.16", features = ["serde-serialize"] }
217217
openh264 = "0.8.0"
218218
ordered-float = { version = "4.6", features = ["serde"] }
219-
parry2d-f64 = "0.18"
220-
parry3d-f64 = "0.18"
219+
parry2d-f64 = "0.23"
220+
parry3d-f64 = "0.23"
221221
pin-project = "1.0.11"
222222
preferences-serde1 = "2.0.0"
223223
pretty-print-nalgebra = "0.1.0"

geometry/braid-april-cal/src/lib.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,12 +350,18 @@ fn run_sqpnp<'a>(
350350
if solver.solve(&p3ds, &p2ds, None) {
351351
let solution = solver.best_solution().unwrap();
352352
let r = solution.rotation_matrix();
353-
let r: nalgebra::SMatrix<f64, 3, 3> = r.as_dmat3().into();
353+
// Convert from glam 0.29 (nalgebra 0.33) to nalgebra 0.34. Waiting for
354+
// https://github.com/ricky26/sqpnp-rs/pull/2
355+
let r = {
356+
let row_data = r.as_dmat3().transpose().to_cols_array();
357+
nalgebra::SMatrix::<f64, 3, 3>::from_row_slice(&row_data)
358+
};
359+
// let r: nalgebra::SMatrix<f64, 3, 3> = r.as_dmat3().into();
354360
let t = solution.translation();
355361

356362
let extrin = {
357363
let rotation = nalgebra::UnitQuaternion::from_rotation_matrix(
358-
&nalgebra::Rotation3::from_matrix_unchecked(r),
364+
&nalgebra::Rotation3::from_matrix(&r),
359365
);
360366
let translation = nalgebra::Translation::from(nalgebra::Vector3::new(
361367
t.x as f64, t.y as f64, t.z as f64,

geometry/braid-mvg/src/pymvg_support.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ mod array_of_arrays {
113113
.as_array()
114114
.ok_or_else(|| serde::de::Error::custom("expected array"))?;
115115

116-
if rows.len() != ROWS::USIZE {
116+
if rows.len() != ROWS::DIM {
117117
return Err(serde::de::Error::custom(format!(
118118
"expected {} rows, found {}",
119-
ROWS::USIZE,
119+
ROWS::DIM,
120120
rows.len()
121121
)));
122122
}

0 commit comments

Comments
 (0)