From 57649f1ece952a7fbb4191dd35c40f975d712aa3 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Tue, 8 Apr 2025 11:16:03 +0200 Subject: [PATCH] Update name of struct --- experiments/2025-03-18/src/geometry/mod.rs | 2 +- experiments/2025-03-18/src/geometry/plane.rs | 8 ++++---- experiments/2025-03-18/src/geometry/surface.rs | 4 ++-- experiments/2025-03-18/src/model.rs | 4 ++-- experiments/2025-03-18/src/operations/connect.rs | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/experiments/2025-03-18/src/geometry/mod.rs b/experiments/2025-03-18/src/geometry/mod.rs index 4ac64ccb3..b0749b2e5 100644 --- a/experiments/2025-03-18/src/geometry/mod.rs +++ b/experiments/2025-03-18/src/geometry/mod.rs @@ -5,6 +5,6 @@ mod surface; mod tri_mesh; pub use self::{ - curve::CurveGeometry, plane::Plane, sketch::Sketch, + curve::CurveGeometry, plane::SweptCurve, sketch::Sketch, surface::SurfaceGeometry, tri_mesh::ToTriMesh, }; diff --git a/experiments/2025-03-18/src/geometry/plane.rs b/experiments/2025-03-18/src/geometry/plane.rs index 08d3aa250..137554972 100644 --- a/experiments/2025-03-18/src/geometry/plane.rs +++ b/experiments/2025-03-18/src/geometry/plane.rs @@ -1,12 +1,12 @@ use fj_math::{Line, Point, Transform, Vector}; #[derive(Clone, Copy, Debug)] -pub struct Plane { +pub struct SweptCurve { pub curve: Line<3>, pub v: Vector<3>, } -impl Plane { +impl SweptCurve { pub fn from_points([a, b, c]: [Point<3>; 3]) -> Self { let (curve, _) = Line::from_points([a, b]); Self { curve, v: c - a } @@ -65,11 +65,11 @@ impl Plane { mod tests { use fj_math::{Line, Point, Vector}; - use super::Plane; + use super::SweptCurve; #[test] fn project_point() { - let plane = Plane { + let plane = SweptCurve { curve: Line::from_origin_and_direction([1., 1., 1.], [1., 0., 0.]), v: Vector::from([0., 1., 0.]), }; diff --git a/experiments/2025-03-18/src/geometry/surface.rs b/experiments/2025-03-18/src/geometry/surface.rs index 652b67982..c22b4e2e4 100644 --- a/experiments/2025-03-18/src/geometry/surface.rs +++ b/experiments/2025-03-18/src/geometry/surface.rs @@ -1,7 +1,7 @@ use fj_math::{Point, Vector}; use geo::Polygon; -use crate::geometry::Plane; +use crate::geometry::SweptCurve; pub trait SurfaceGeometry { fn point_from_local(&self, point: Point<2>) -> Point<3>; @@ -23,7 +23,7 @@ pub trait SurfaceGeometry { fn approximate(&self, boundary: &Polygon) -> Vec>; } -impl SurfaceGeometry for Plane { +impl SurfaceGeometry for SweptCurve { fn point_from_local(&self, point: Point<2>) -> Point<3> { self.point_from_local(point) } diff --git a/experiments/2025-03-18/src/model.rs b/experiments/2025-03-18/src/model.rs index cb3709183..d86297f4d 100644 --- a/experiments/2025-03-18/src/model.rs +++ b/experiments/2025-03-18/src/model.rs @@ -3,7 +3,7 @@ use fj_math::{Line, Vector}; use fj_viewer::Viewer; use crate::{ - geometry::{Plane, Sketch, ToTriMesh}, + geometry::{Sketch, SweptCurve, ToTriMesh}, handle::Handle, operations::sweep::SweepExt, topology::surface::Surface, @@ -31,7 +31,7 @@ pub fn model(viewer: &Viewer) -> TriMesh { ]); let surface = Handle::new(Surface { - geometry: Box::new(Plane { + geometry: Box::new(SweptCurve { curve: Line::from_origin_and_direction( [0., 0., 1.], [1., 0., 0.], diff --git a/experiments/2025-03-18/src/operations/connect.rs b/experiments/2025-03-18/src/operations/connect.rs index f207aac85..b9fc5412c 100644 --- a/experiments/2025-03-18/src/operations/connect.rs +++ b/experiments/2025-03-18/src/operations/connect.rs @@ -1,7 +1,7 @@ use itertools::Itertools; use crate::{ - geometry::Plane, + geometry::SweptCurve, handle::Handle, topology::{ curve::Curve, @@ -112,7 +112,7 @@ fn build_single_connecting_face( }; let surface = Handle::new(Surface { - geometry: Box::new(Plane::from_points( + geometry: Box::new(SweptCurve::from_points( [ &bottom.half_edge.start, bottom.end_vertex,