diff --git a/Cargo.toml b/Cargo.toml index 26debee..95bc44e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "implicit3d" -version = "0.14.2" +version = "0.15.0" authors = ["Henning Meyer "] edition = "2018" @@ -15,15 +15,15 @@ name = "implicit3d" path = "src/lib.rs" [dependencies] -nalgebra = "0.22" -alga = "0.9" -stl_io = "0.5" -bbox = "0.11" -num-traits = "0.2" +bbox = "0.11.2" +nalgebra = "0.27.1" +num-traits = "0.2.14" +simba = "0.5.1" +stl_io = "0.6.0" [dev-dependencies] -bencher = "0.1" -approx = "0.3" +bencher = "0.1.5" +approx = "0.5.0" [[bench]] name = "objects" @@ -33,3 +33,6 @@ harness = false [badges] travis-ci = { repository = "hmeyer/implicit3d", branch = "master" } codecov = { repository = "hmeyer/implicit3d", branch = "master", service = "github" } + +[patch.crates-io] +bbox = { git = "https://github.com/dflemstr/bbox.git" } diff --git a/src/lib.rs b/src/lib.rs index 8160511..cdab07b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -40,8 +40,8 @@ pub use bbox::BoundingBox; use num_traits::Float; use std::fmt::Debug; -/// A Combination of alga::general::RealField and na::RealField. -pub trait RealField: alga::general::RealField + na::RealField {} +/// A Combination of `simba::scalar::RealField` and `na::RealField`. +pub trait RealField: simba::scalar::RealField + na::RealField {} impl RealField for f64 {} impl RealField for f32 {} diff --git a/src/transformer.rs b/src/transformer.rs index 53a362e..0150b45 100644 --- a/src/transformer.rs +++ b/src/transformer.rs @@ -86,7 +86,7 @@ impl> AffineTransformer { Some(ref t_inv) => { let bbox = o.bbox().transform(t_inv); let transposed3x3 = t - .fixed_slice::<::na::core::dimension::U3, ::na::core::dimension::U3>(0, 0) + .fixed_slice::<3, 3>(0, 0) .transpose(); AffineTransformer { object: o, diff --git a/src/twister.rs b/src/twister.rs index e471684..08cc828 100644 --- a/src/twister.rs +++ b/src/twister.rs @@ -62,7 +62,7 @@ impl> Twister { fn twist_point(&self, p: &na::Point3) -> na::Point3 { let p2 = ::na::Point2::new(p.x, p.y); let angle = p.z * self.height_scaler; - type Rota = ::na::Rotation; + type Rota = ::na::Rotation; let trans = Rota::new(angle); let rp2 = trans.transform_point(&p2); na::Point3::new(rp2.x, rp2.y, p.z)