diff --git a/experiments/2024-12-09/src/model.rs b/experiments/2024-12-09/src/model.rs index 5c7f509ff..56a14e51f 100644 --- a/experiments/2024-12-09/src/model.rs +++ b/experiments/2024-12-09/src/model.rs @@ -2,7 +2,7 @@ use crate::{ geometry::{AnyOp, Sketch}, math::{Bivector, Plane, Point, Vector}, storage::Stores, - topology::solid::Solid, + topology::sweep::SweepExt, }; pub fn model() -> AnyOp { @@ -25,8 +25,7 @@ pub fn model() -> AnyOp { let top = stores.faces.insert(top); - let solid = Solid::sweep_from( - top, + let solid = top.sweep( [0., 0., -1.], &mut stores.faces, &mut stores.surfaces, diff --git a/experiments/2024-12-09/src/topology/solid.rs b/experiments/2024-12-09/src/topology/solid.rs index 24a0c2fac..01d83c6d6 100644 --- a/experiments/2024-12-09/src/topology/solid.rs +++ b/experiments/2024-12-09/src/topology/solid.rs @@ -1,10 +1,10 @@ use crate::{ geometry::{AnyOp, Handle, Operation, TriMesh}, - math::{Plane, Vector}, + math::Plane, storage::Store, }; -use super::{face::Face, sweep::SweepExt, vertex::Vertex}; +use super::face::Face; pub struct Solid { faces: Vec>, @@ -17,16 +17,6 @@ impl Solid { } } - pub fn sweep_from( - origin: Handle, - path: impl Into>, - faces: &mut Store, - surfaces: &mut Store, - vertices: &mut Store, - ) -> Self { - origin.sweep(path, faces, surfaces, vertices) - } - /// Connect two faces by creating a side wall of faces from their vertices /// /// ## Panics