From 5ba2eb09be249b14795c4180479d0a15874942a3 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Tue, 30 Jan 2024 10:54:29 +0100 Subject: [PATCH] Return bare `Solid` from `spacer` model --- models/spacer/src/lib.rs | 4 +--- models/spacer/src/main.rs | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/models/spacer/src/lib.rs b/models/spacer/src/lib.rs index 8c7bd9684..d5a0afe63 100644 --- a/models/spacer/src/lib.rs +++ b/models/spacer/src/lib.rs @@ -9,7 +9,6 @@ use fj::{ update::{UpdateRegion, UpdateSketch}, }, services::Services, - storage::Handle, }, math::{Point, Vector}, }; @@ -19,7 +18,7 @@ pub fn model( inner: f64, height: f64, services: &mut Services, -) -> Handle { +) -> Solid { let bottom_surface = services.objects.surfaces.xy_plane(); let sweep_path = Vector::from([0., 0., height]); @@ -36,5 +35,4 @@ pub fn model( .insert(services), ) .sweep_sketch(bottom_surface, sweep_path, services) - .insert(services) } diff --git a/models/spacer/src/main.rs b/models/spacer/src/main.rs index 6ba026330..2a81481e8 100644 --- a/models/spacer/src/main.rs +++ b/models/spacer/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 = spacer::model(1., 0.5, 1., &mut services); - handle_model(model.deref(), services)?; + handle_model(&model, services)?; Ok(()) }