From c1d2fc1f1e590d4c66c7721240ee8c119c4ab247 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Thu, 14 Dec 2023 13:03:21 +0100 Subject: [PATCH] Re-use `cuboid` model in `split` model --- Cargo.lock | 1 + models/split/Cargo.toml | 4 ++++ models/split/src/lib.rs | 37 ++++++++----------------------------- 3 files changed, 13 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6701bb7d0..30f5c5219 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2989,6 +2989,7 @@ dependencies = [ name = "split" version = "0.1.0" dependencies = [ + "cuboid", "fj", ] diff --git a/models/split/Cargo.toml b/models/split/Cargo.toml index ea5cc981e..6948733d9 100644 --- a/models/split/Cargo.toml +++ b/models/split/Cargo.toml @@ -3,5 +3,9 @@ name = "split" version = "0.1.0" edition = "2021" + [dependencies.fj] path = "../../crates/fj" + +[dependencies.cuboid] +path = "../cuboid" diff --git a/models/split/src/lib.rs b/models/split/src/lib.rs index d58003683..a17fbdb8a 100644 --- a/models/split/src/lib.rs +++ b/models/split/src/lib.rs @@ -1,17 +1,11 @@ -use fj::{ - core::{ - objects::{Region, Sketch, Solid}, - operations::{ - build::{BuildRegion, BuildSketch}, - insert::Insert, - split::SplitFace, - sweep::{SweepFaceOfShell, SweepSketch}, - update::{UpdateSketch, UpdateSolid}, - }, - services::Services, - storage::Handle, +use fj::core::{ + objects::Solid, + operations::{ + insert::Insert, split::SplitFace, sweep::SweepFaceOfShell, + update::UpdateSolid, }, - math::Vector, + services::Services, + storage::Handle, }; pub fn model( @@ -19,22 +13,7 @@ pub fn model( split_pos: f64, services: &mut Services, ) -> Handle { - let sketch = Sketch::empty().add_region( - Region::polygon( - [ - [-size / 2., -size / 2.], - [size / 2., -size / 2.], - [size / 2., size / 2.], - [-size / 2., size / 2.], - ], - services, - ) - .insert(services), - ); - - let surface = services.objects.surfaces.xy_plane(); - let path = Vector::from([0., 0., size]); - let solid = sketch.sweep_sketch(surface, path, services); + let solid = cuboid::model([size, size, size], services); solid .update_shell(solid.shells().only(), |shell| {