remove float_types.rs

Author: timschmidt

src/aabb.rs

@@ -6,15 +6,28 @@ pub struct Aabb<T: Scalar> {
     pub maxs: Point3<T>,
 }
 
-impl<T> Aabb<T> {
+impl<T: Scalar + PartialOrd> Aabb<T> {
     #[inline]
     pub const fn new(mins: Point3<T>, maxs: Point3<T>) -> Self {
         Self { mins, maxs }
     }
 
-    pub fn intersects(&self, other: &Aabb<T>) -> bool {
-        self.max.x >= other.min.x && self.min.x <= other.max.x &&
-        self.max.y >= other.min.y && self.min.y <= other.max.y &&
-        self.max.z >= other.min.z && self.min.z <= other.max.z
+    #[inline]
+    pub fn intersects(&self, other: &Self) -> bool {
+        self.maxs.x >= other.mins.x
+            && self.mins.x <= other.maxs.x
+            && self.maxs.y >= other.mins.y
+            && self.mins.y <= other.maxs.y
+            && self.maxs.z >= other.mins.z
+            && self.mins.z <= other.maxs.z
+    }
+
+    #[inline]
+    pub fn center(&self) -> Point3<T> {
+        Point3::new(
+            (self.mins.x + self.maxs.x) / T::mixed_from(2.0),
+            (self.mins.y + self.maxs.y) / T::mixed_from(2.0),
+            (self.mins.z + self.maxs.z) / T::mixed_from(2.0),
+        )
     }
 }

src/float_types.rs

@@ -383,7 +383,7 @@ pub trait FromSVG: Sized {
     fn from_svg(doc: &str) -> Result<Self, IoError>;
 }
 
-impl FromSVG for Sketch<()> {
+impl<T> FromSVG for Sketch<(), T> {
     fn from_svg(doc: &str) -> Result<Self, IoError> {
         use svg::node::element::tag::{self, Type::*};
         use svg::parser::Event;

src/io/svg.rs

@@ -18,7 +18,7 @@ use crate::mesh::Vertex;
 #[cfg(feature = "parallel")]
 use crate::math_ndsp::consts::EPSILON;
 
-impl<S: Clone + Send + Sync + Debug> Node<S> {
+impl<S: Clone + Send + Sync + Debug, T> Node<S, T> {
     /// Invert all polygons in the BSP tree using iterative approach to avoid stack overflow
     #[cfg(feature = "parallel")]
     pub fn invert(&mut self) {
@@ -47,7 +47,7 @@ impl<S: Clone + Send + Sync + Debug> Node<S> {
 
     /// Parallel version of clip Polygons
     #[cfg(feature = "parallel")]
-    pub fn clip_polygons(&self, polygons: &[Polygon<S>]) -> Vec<Polygon<S>> {
+    pub fn clip_polygons(&self, polygons: &[Polygon<S, T>]) -> Vec<Polygon<S, T>> {
         // If this node has no plane, just return the original set
         if self.plane.is_none() {
             return polygons.to_vec();
@@ -102,7 +102,7 @@ impl<S: Clone + Send + Sync + Debug> Node<S> {
 
     /// Parallel version of `clip_to` using iterative approach to avoid stack overflow
     #[cfg(feature = "parallel")]
-    pub fn clip_to(&mut self, bsp: &Node<S>) {
+    pub fn clip_to(&mut self, bsp: &Node<S, T>) {
         // Use iterative approach with a stack to avoid recursive stack overflow
         let mut stack = vec![self];
 
@@ -122,7 +122,7 @@ impl<S: Clone + Send + Sync + Debug> Node<S> {
 
     /// Parallel version of `build`.
     #[cfg(feature = "parallel")]
-    pub fn build(&mut self, polygons: &[Polygon<S>]) {
+    pub fn build(&mut self, polygons: &[Polygon<S, T>]) {
         if polygons.is_empty() {
             return;
         }
@@ -167,7 +167,7 @@ impl<S: Clone + Send + Sync + Debug> Node<S> {
 
     // Parallel slice
     #[cfg(feature = "parallel")]
-    pub fn slice(&self, slicing_plane: &Plane) -> (Vec<Polygon<S>>, Vec<[Vertex; 2]>) {
+    pub fn slice(&self, slicing_plane: &Plane<T>) -> (Vec<Polygon<S, T>>, Vec<[Vertex; 2]>) {
         // Collect all polygons (this can be expensive, but let's do it).
         let all_polys = self.all_polygons();