From 07b2b46b7e4b8dfb690cbd98089929a431dcee03 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Tue, 18 Mar 2025 21:01:48 +0100 Subject: [PATCH] Simplify --- experiments/2025-03-18/src/main.rs | 5 +---- experiments/2025-03-18/src/model.rs | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/experiments/2025-03-18/src/main.rs b/experiments/2025-03-18/src/main.rs index d4739f941..169a00e4b 100644 --- a/experiments/2025-03-18/src/main.rs +++ b/experiments/2025-03-18/src/main.rs @@ -1,7 +1,5 @@ #![allow(clippy::module_inception)] -use object::Object; - mod app; mod export; mod extra; @@ -14,8 +12,7 @@ mod render; mod topology; fn main() -> anyhow::Result<()> { - let model = model::model(); - let tri_mesh = model.tri_mesh(); + let tri_mesh = model::model(); export::export(&tri_mesh)?; app::run(tri_mesh)?; diff --git a/experiments/2025-03-18/src/model.rs b/experiments/2025-03-18/src/model.rs index 1407d31f6..8dd1843a0 100644 --- a/experiments/2025-03-18/src/model.rs +++ b/experiments/2025-03-18/src/model.rs @@ -1,12 +1,12 @@ use crate::{ - geometry::Sketch, + geometry::{Sketch, TriMesh}, math::{Bivector, Plane, Point, Vector}, - object::{Handle, HandleAny}, + object::{Handle, HandleAny, Object}, operations::sweep::SweepExt, topology::surface::Surface, }; -pub fn model() -> HandleAny { +pub fn model() -> TriMesh { let top = { let sketch = Sketch::from([ // outer boundary @@ -42,5 +42,5 @@ pub fn model() -> HandleAny { let solid = top.sweep([0., 0., -2.]); - HandleAny::new(solid) + HandleAny::new(solid).tri_mesh() }