From 3229d19a11072921c13e9475fb943e914cfff741 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Wed, 18 Jun 2025 11:50:27 +0200 Subject: [PATCH] Make name of type more explicit --- crates/fj-viewer/src/lib.rs | 2 +- crates/fj-viewer/src/viewer.rs | 8 ++++---- experiments/2025-03-18/src/model.rs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/fj-viewer/src/lib.rs b/crates/fj-viewer/src/lib.rs index 93b397327..1393de439 100644 --- a/crates/fj-viewer/src/lib.rs +++ b/crates/fj-viewer/src/lib.rs @@ -17,5 +17,5 @@ mod window; pub use self::{ graphics::RendererInitError, - viewer::{Error, Viewer, make_viewer_and_spawn_thread}, + viewer::{Error, ViewerHandle, make_viewer_and_spawn_thread}, }; diff --git a/crates/fj-viewer/src/viewer.rs b/crates/fj-viewer/src/viewer.rs index 4663a9003..992010904 100644 --- a/crates/fj-viewer/src/viewer.rs +++ b/crates/fj-viewer/src/viewer.rs @@ -34,7 +34,7 @@ use crate::{ /// This function should be called from the application's main thread, or /// displaying models might end up not working correctly. pub fn make_viewer_and_spawn_thread( - f: impl FnOnce(Viewer) -> R + Send + 'static, + f: impl FnOnce(ViewerHandle) -> R + Send + 'static, ) -> Result where R: Send + 'static, @@ -46,7 +46,7 @@ where }; let proxy = event_loop.create_proxy(); - let handle = thread::spawn(|| f(Viewer { event_loop: proxy })); + let handle = thread::spawn(|| f(ViewerHandle { event_loop: proxy })); event_loop.run_app(&mut display_state)?; @@ -59,11 +59,11 @@ where } /// # Fornjot model viewer -pub struct Viewer { +pub struct ViewerHandle { event_loop: EventLoopProxy, } -impl Viewer { +impl ViewerHandle { /// # Display a 2D face in a new window pub fn display_face(&self, points: Vec>) { // If there's an error, that means the display thread has closed down diff --git a/experiments/2025-03-18/src/model.rs b/experiments/2025-03-18/src/model.rs index 6c83b48f1..73891ab77 100644 --- a/experiments/2025-03-18/src/model.rs +++ b/experiments/2025-03-18/src/model.rs @@ -1,6 +1,6 @@ use fj_interop::{Tolerance, TriMesh}; use fj_math::Vector; -use fj_viewer::Viewer; +use fj_viewer::ViewerHandle; use crate::{ geometry::{FloatingCurve, Line, Sketch, SweptCurve}, @@ -9,7 +9,7 @@ use crate::{ topology::surface::Surface, }; -pub fn model(viewer: &Viewer) -> TriMesh { +pub fn model(viewer: &ViewerHandle) -> TriMesh { let tolerance = Tolerance::from(0.001); let top = {