Replace fj_kernel's Circle with fj_math::Circle

crates/fj-kernel/src/algorithms/approx/curves.rs

@@ -1,8 +1,8 @@
 use std::cmp::max;
 
-use fj_math::Scalar;
+use fj_math::{Circle, Scalar};
 
-use crate::geometry::{self, Circle, Curve};
+use crate::geometry::{self, Curve};
 
 use super::Tolerance;
 
@@ -36,7 +36,7 @@ pub fn approx_curve(
 /// `tolerance` specifies how much the approximation is allowed to deviate
 /// from the circle.
 pub fn approx_circle(
-    circle: &Circle,
+    circle: &Circle<3>,
     tolerance: Tolerance,
     out: &mut Vec<geometry::Point<1>>,
 ) {

crates/fj-kernel/src/geometry/curves/mod.rs → crates/fj-kernel/src/geometry/curves.rs

@@ -1,8 +1,4 @@
-mod circle;
-
-pub use self::circle::Circle;
-
-use fj_math::{Line, Point, Transform, Vector};
+use fj_math::{Circle, Line, Point, Transform, Vector};
 
 use crate::geometry;
 
@@ -18,7 +14,7 @@ use crate::geometry;
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Hash, Ord, PartialOrd)]
 pub enum Curve {
     /// A circle
-    Circle(Circle),
+    Circle(Circle<3>),
 
     /// A line
     Line(Line<3>),
@@ -52,7 +48,7 @@ impl Curve {
     /// Access the origin of the curve's coordinate system
     pub fn origin(&self) -> Point<3> {
         match self {
-            Self::Circle(curve) => curve.origin(),
+            Self::Circle(curve) => curve.center,
             Self::Line(curve) => curve.origin,
         }
     }
@@ -70,7 +66,9 @@ impl Curve {
     #[must_use]
     pub fn transform(self, transform: &Transform) -> Self {
         match self {
-            Self::Circle(curve) => Self::Circle(curve.transform(transform)),
+            Self::Circle(curve) => {
+                Self::Circle(transform.transform_circle(&curve))
+            }
             Self::Line(curve) => Self::Line(transform.transform_line(&curve)),
         }
     }

crates/fj-kernel/src/geometry/mod.rs

@@ -10,7 +10,7 @@ mod points;
 mod surfaces;
 
 pub use self::{
-    curves::{Circle, Curve},
+    curves::Curve,
     points::Point,
     surfaces::{Surface, SweptCurve},
 };

crates/fj-kernel/src/topology/builder.rs

@@ -1,7 +1,7 @@
-use fj_math::{Line, Point, Scalar, Vector};
+use fj_math::{Circle, Line, Point, Scalar, Vector};
 
 use crate::{
-    geometry::{Circle, Curve, Surface},
+    geometry::{Curve, Surface},
     shape::{Handle, Shape, ValidationResult},
 };