From c3ac8defcd08ab9fb63d68e0e27673c75b315e9b Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Tue, 18 Mar 2025 20:56:08 +0100 Subject: [PATCH] Simplify --- experiments/2025-03-18/src/app.rs | 10 +++------- experiments/2025-03-18/src/main.rs | 4 +++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/experiments/2025-03-18/src/app.rs b/experiments/2025-03-18/src/app.rs index 36892ce93..5482e4905 100644 --- a/experiments/2025-03-18/src/app.rs +++ b/experiments/2025-03-18/src/app.rs @@ -8,17 +8,13 @@ use winit::{ window::{Window, WindowAttributes, WindowId}, }; -use crate::{ - geometry::TriMesh, - object::{HandleAny, Object}, - render::Renderer, -}; +use crate::{geometry::TriMesh, render::Renderer}; -pub fn run(shape: HandleAny) -> anyhow::Result<()> { +pub fn run(tri_mesh: TriMesh) -> anyhow::Result<()> { let event_loop = EventLoop::new()?; let mut app = App { - tri_mesh: shape.tri_mesh(), + tri_mesh, window: None, renderer: None, }; diff --git a/experiments/2025-03-18/src/main.rs b/experiments/2025-03-18/src/main.rs index b7b336597..cb74be75b 100644 --- a/experiments/2025-03-18/src/main.rs +++ b/experiments/2025-03-18/src/main.rs @@ -1,5 +1,7 @@ #![allow(clippy::module_inception)] +use object::Object; + mod app; mod export; mod extra; @@ -15,7 +17,7 @@ fn main() -> anyhow::Result<()> { let model = model::model(); export::export(&model)?; - app::run(model)?; + app::run(model.tri_mesh())?; Ok(()) }