From c29415fe634e4d0cfb1903dd416245dfb08ce5c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Flemstr=C3=B6m?= Date: Tue, 8 Jun 2021 17:24:41 +0200 Subject: [PATCH 1/2] Upgrade dependencies and switch from alga to simba --- Cargo.toml | 24 ++++++++++++++---------- src/lib.rs | 2 +- src/mesh.rs | 2 +- src/plane.rs | 2 +- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e0c21cf..50e78cb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,18 +15,18 @@ name = "tessellation" path = "src/lib.rs" [dependencies] -alga = "0.9" -nalgebra = "0.22" -rand = "0.7" -rayon = "1.2" -once_cell = "1.4" -bbox = "0.11" -num-traits = "0.2" +bbox = "0.11.2" +nalgebra = "0.27.1" +num-traits = "0.2.14" +once_cell = "1.7.2" +rand = "0.8.3" +rayon = "1.5.1" +simba = "0.5.1" [dev-dependencies] -approx = "0.3" -bencher = "0.1" -implicit3d = "0.14" +approx = "0.5.0" +bencher = "0.1.5" +implicit3d = "0.14.2" [[bench]] name = "tessellation" @@ -36,3 +36,7 @@ harness = false [badges] travis-ci = { repository = "hmeyer/tessellation", branch = "master" } codecov = { repository = "hmeyer/tessellation", branch = "master", service = "github" } + +[patch.crates-io] +bbox = { git = "https://github.com/dflemstr/bbox.git" } +implicit3d = { git = "https://github.com/dflemstr/implicit3d.git" } diff --git a/src/lib.rs b/src/lib.rs index 03513b4..82c466a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -55,7 +55,7 @@ pub use self::manifold_dual_contouring::ManifoldDualContouring; pub use self::mesh::Mesh; /// A Combination of alga::general::RealField and na::RealField. -pub trait RealField: alga::general::RealField + na::RealField {} +pub trait RealField: simba::scalar::RealField + na::RealField {} impl RealField for f64 {} impl RealField for f32 {} diff --git a/src/mesh.rs b/src/mesh.rs index 8758677..9be1f01 100644 --- a/src/mesh.rs +++ b/src/mesh.rs @@ -1,4 +1,4 @@ -use alga::general::RealField; +use simba::scalar::RealField; use nalgebra as na; use std::error::Error; use std::fmt; diff --git a/src/plane.rs b/src/plane.rs index 2d8472a..fcabb10 100644 --- a/src/plane.rs +++ b/src/plane.rs @@ -1,4 +1,4 @@ -use alga::general::RealField; +use simba::scalar::RealField; use nalgebra as na; use std::fmt::Debug; From 3e98540320ef5cecd3be35b03b7503ccde5a595c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Flemstr=C3=B6m?= Date: Thu, 10 Jun 2021 22:57:32 +0200 Subject: [PATCH 2/2] Bump to version 0.9.0 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 50e78cb..f8cab8c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tessellation" -version = "0.8.2" +version = "0.9.0" authors = ["Henning Meyer "] edition = "2018"