fix up some import errors

Author: timschmidt

src/errors.rs

@@ -1,5 +1,5 @@
 type Real = f64;
-use nalgebra::Point3;
+use crate::math_ndsp::Point3;
 
 /// All the possible validation issues we might encounter,
 #[derive(Debug, Clone, PartialEq)]

src/io/dxf.rs

@@ -81,7 +81,7 @@ impl<S: Clone + Debug + Send + Sync> Mesh<S> {
 
                     for i in 0..segments {
                         let theta =
-                            2.0 * crate::float_types::PI * (i as Real) / (segments as Real);
+                            2.0 * crate::math_ndsp::consts::PI * (i as Real) / (segments as Real);
                         let x = center.x as Real + radius * theta.cos();
                         let y = center.y as Real + radius * theta.sin();
                         let z = center.z as Real;

src/lib.rs

@@ -31,6 +31,7 @@
 
 pub mod errors;
 pub mod math_ndsp;
+pub mod aabb;
 pub mod io;
 pub mod mesh;
 pub mod nurbs;

src/main.rs

@@ -8,7 +8,7 @@ type Real = f64;
 
 use csgrs::mesh::plane::Plane;
 use csgrs::traits::CSG;
-use nalgebra::{Point3, Vector3};
+use crate::math_ndsp::{Point3, Vector3};
 use std::fs;
 
 #[cfg(feature = "image")]

src/math_ndsp.rs

@@ -2,6 +2,8 @@
 
 use core::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign};
 use mixed_num::traits::*;
+use mixed_num::MixedAbs;
+type Real = f64;
 
 pub mod consts {
     // We keep the library on f64 for now (simple migration).
@@ -28,7 +30,7 @@ pub struct Vector3<T> {
     pub z: T,
 }
 
-impl<T: MixedNum + MixedOps + Copy> Vector3<T> {
+impl<T: MixedNum + MixedOps + Copy + MixedAbs> Vector3<T> {
     #[inline]
     pub const fn new(x: T, y: T, z: T) -> Self { Self { x, y, z } }
 
@@ -207,17 +209,17 @@ impl<T: MixedNum + MixedOps + Copy> Matrix3<T> {
         let det = self.det();
         if det.mixed_abs() <= eps() { return None; }
         let m = &self.m;
-        let c00 =  (m[1][1]*m[2][2] - m[1][2]*m[2][1]);
+        let c00 =  m[1][1]*m[2][2] - m[1][2]*m[2][1];
         let c01 = -(m[1][0]*m[2][2] - m[1][2]*m[2][0]);
-        let c02 =  (m[1][0]*m[2][1] - m[1][1]*m[2][0]);
+        let c02 =  m[1][0]*m[2][1] - m[1][1]*m[2][0];
 
         let c10 = -(m[0][1]*m[2][2] - m[0][2]*m[2][1]);
-        let c11 =  (m[0][0]*m[2][2] - m[0][2]*m[2][0]);
+        let c11 =  m[0][0]*m[2][2] - m[0][2]*m[2][0];
         let c12 = -(m[0][0]*m[2][1] - m[0][1]*m[2][0]);
 
-        let c20 =  (m[0][1]*m[1][2] - m[0][2]*m[1][1]);
+        let c20 =  m[0][1]*m[1][2] - m[0][2]*m[1][1];
         let c21 = -(m[0][0]*m[1][2] - m[0][2]*m[1][0]);
-        let c22 =  (m[0][0]*m[1][1] - m[0][1]*m[1][0]);
+        let c22 =  m[0][0]*m[1][1] - m[0][1]*m[1][0];
 
         let adj_t = [
             [c00, c10, c20],
@@ -310,7 +312,7 @@ impl<T: MixedNum + MixedOps + Copy> Matrix3<T> {
                     Vector3::z()
                 };
                 ortho = f.cross(ortho).normalize();
-                return Self::rotation_axis_angle(ortho, (T::mixed_pi()));
+                return Self::rotation_axis_angle(ortho, T::mixed_pi());
             }
         }
         // Rodrigues without trig: R = I + [v]_x + [v]_x² * ((1 - c)/|v|²)
@@ -559,7 +561,7 @@ impl Rotation3 {
     pub fn from_axis_angle(axis: &Vector3, angle: Real) -> Self {
         let mut k = *axis;
         let n2 = k.dot(&k);
-        if n2 <= EPSILON * EPSILON {
+        if n2 <= consts::EPSILON * consts::EPSILON {
             return Self::identity();
         }
         k /= n2.sqrt(); // normalize
@@ -591,7 +593,7 @@ impl Rotation3 {
     pub fn rotation_between(a: &Vector3, b: &Vector3) -> Option<Self> {
         let la = a.norm();
         let lb = b.norm();
-        if la <= EPSILON || lb <= EPSILON {
+        if la <= consts::EPSILON || lb <= consts::EPSILON {
             return None;
         }
         let u = *a / la;
@@ -601,7 +603,7 @@ impl Rotation3 {
         let axis = u.cross(&v);
         let s = axis.norm();               // |u × v| = sin(theta)
 
-        if s <= EPSILON {
+        if s <= consts::EPSILON {
             // Collinear: either identity or 180° turn around any perpendicular axis.
             if c > 0.0 {
                 return Some(Self::identity());

src/sketch/extrudes.rs

@@ -824,7 +824,7 @@ impl<S: Clone + Debug + Send + Sync> Sketch<S> {
     /// * returns - a `Mesh<S>` containing all side quads plus automatically triangulated caps (respecting any holes).
     pub fn sweep(&self, path: &[Point3<Real>]) -> Mesh<S> {
         use crate::mesh::{Mesh, polygon::Polygon, vertex::Vertex};
-        use nalgebra::{Matrix4, Rotation3, Translation3};
+        use crate::math_ndsp::{Matrix4, Rotation3, Translation3};
 
         // sanity checks
         if path.len() < 2 || self.geometry.0.is_empty() {

src/tests.rs

@@ -9,7 +9,7 @@ use crate::sketch::Sketch;
 use crate::traits::CSG;
 use geo::{Area, Geometry, HasDimensions};
 use hashbrown::HashMap;
-use nalgebra::{Point3, Vector3};
+use crate::math_ndsp::{Point3, Vector3};
 type Real = f64;
 
 // --------------------------------------------------------

src/toolpath/mod.rs

@@ -15,9 +15,10 @@
 //! - Requires `csgrs` to be compiled with the `offset` feature for kerf/tool radius comp.
 
 use core::fmt::Debug;
-use nalgebra::Point3;
+use crate::math_ndsp::Point3;
 
-use crate::float_types::{EPSILON, Real};
+type Real = f64;
+use crate::math_ndsp::consts::{EPSILON};
 use crate::sketch::Sketch;
 
 // ==========================

src/traits.rs

@@ -1,7 +1,7 @@
-use crate::float_types::parry3d::bounding_volume::Aabb;
+use crate::aabb::Aabb;
 use crate::math_ndsp::consts::{EPSILON};
 use crate::mesh::plane::Plane;
-use nalgebra::{Matrix3, Matrix4, Rotation3, Translation3, Vector3};
+use crate::math_ndsp::{Matrix3, Matrix4, Rotation3, Translation3, Vector3};
 type Real = f64;
 
 /// Boolean operations + transformations
@@ -179,11 +179,11 @@ pub trait CSG: Sized + Clone {
 
                 let angle = start_rad + t * sweep;
                 let rot =
-                    nalgebra::Rotation3::from_axis_angle(&nalgebra::Vector3::z_axis(), angle)
+                    Rotation3::from_axis_angle(&Vector3::z_axis(), angle)
                         .to_homogeneous();
 
                 // translate out to radius in x
-                let trans = nalgebra::Translation3::new(radius, 0.0, 0.0).to_homogeneous();
+                let trans = Translation3::new(radius, 0.0, 0.0).to_homogeneous();
                 let mat = rot * trans;
                 self.transform(&mat)
             })
@@ -209,7 +209,7 @@ pub trait CSG: Sized + Clone {
         (0..count)
             .map(|i| {
                 let offset = step * (i as Real);
-                let trans = nalgebra::Translation3::from(offset).to_homogeneous();
+                let trans = Translation3::from(offset).to_homogeneous();
                 self.transform(&trans)
             })
             .reduce(|acc, csg| acc.union(&csg))
@@ -222,14 +222,14 @@ pub trait CSG: Sized + Clone {
         if rows < 1 || cols < 1 {
             return self.clone();
         }
-        let step_x = nalgebra::Vector3::new(dx, 0.0, 0.0);
-        let step_y = nalgebra::Vector3::new(0.0, dy, 0.0);
+        let step_x = Vector3::new(dx, 0.0, 0.0);
+        let step_y = Vector3::new(0.0, dy, 0.0);
 
         (0..rows)
             .flat_map(|r| {
                 (0..cols).map(move |c| {
                     let offset = step_x * (c as Real) + step_y * (r as Real);
-                    let trans = nalgebra::Translation3::from(offset).to_homogeneous();
+                    let trans = Translation3::from(offset).to_homogeneous();
                     self.transform(&trans)
                 })
             })

src/wasm.rs

@@ -6,7 +6,7 @@ use crate::sketch::Sketch;
 use crate::traits::CSG;
 use geo::{Geometry, GeometryCollection};
 use js_sys::{Float64Array, Object, Reflect, Uint32Array};
-use nalgebra::{Matrix4, Point3, Vector3};
+use crate::math_ndsp::{Matrix4, Point3, Vector3};
 //use serde::{Deserialize, Serialize};
 use serde_wasm_bindgen::from_value; //, to_value};
 use wasm_bindgen::prelude::*;