diff --git a/models/split/src/lib.rs b/models/split/src/lib.rs index 6e2173993..d8cec9e39 100644 --- a/models/split/src/lib.rs +++ b/models/split/src/lib.rs @@ -5,31 +5,24 @@ use fj::core::{ update::UpdateSolid, }, services::Services, - storage::Handle, }; -pub fn model( - size: f64, - split_pos: f64, - services: &mut Services, -) -> Handle { +pub fn model(size: f64, split_pos: f64, services: &mut Services) -> Solid { let cuboid = cuboid::model([size, size, size], services); - cuboid - .update_shell(cuboid.shells().only(), |shell| { - let face = shell.faces().first(); - let cycle = face.region().exterior(); + cuboid.update_shell(cuboid.shells().only(), |shell| { + let face = shell.faces().first(); + let cycle = face.region().exterior(); - let line = [ - (cycle.half_edges().nth(0).unwrap(), [split_pos]), - (cycle.half_edges().nth(2).unwrap(), [split_pos]), - ]; + let line = [ + (cycle.half_edges().nth(0).unwrap(), [split_pos]), + (cycle.half_edges().nth(2).unwrap(), [split_pos]), + ]; - let (shell, [face, _]) = shell.split_face(face, line, services); + let (shell, [face, _]) = shell.split_face(face, line, services); - shell - .sweep_face_of_shell(face, [0., 0., -size / 2.], services) - .insert(services) - }) - .insert(services) + shell + .sweep_face_of_shell(face, [0., 0., -size / 2.], services) + .insert(services) + }) } diff --git a/models/split/src/main.rs b/models/split/src/main.rs index 5ad822b71..b5f4c7440 100644 --- a/models/split/src/main.rs +++ b/models/split/src/main.rs @@ -1,10 +1,8 @@ -use std::ops::Deref; - use fj::{core::services::Services, handle_model}; fn main() -> fj::Result { let mut services = Services::new(); let model = split::model(1.0, 0.2, &mut services); - handle_model(model.deref(), services)?; + handle_model(&model, services)?; Ok(()) }