rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-08-25 11:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make name of type more explicit

Browse Source
This commit is contained in:
Hanno Braun 2025-06-18 11:50:27 +02:00
parent 71a9da0e94
commit 3229d19a11
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/fj-viewer/src/lib.rs
View File

@ -17,5 +17,5 @@ mod window;
pub use self::{ pub use self::{
graphics::RendererInitError, graphics::RendererInitError,
viewer::{Error, Viewer, make_viewer_and_spawn_thread}, viewer::{Error, ViewerHandle, make_viewer_and_spawn_thread},
}; };

8
crates/fj-viewer/src/viewer.rs
View File

@ -34,7 +34,7 @@ use crate::{
/// This function should be called from the application's main thread, or /// This function should be called from the application's main thread, or
/// displaying models might end up not working correctly. /// displaying models might end up not working correctly.
pub fn make_viewer_and_spawn_thread<R>( pub fn make_viewer_and_spawn_thread<R>(
f: impl FnOnce(Viewer) -> R + Send + 'static, f: impl FnOnce(ViewerHandle) -> R + Send + 'static,
) -> Result<R, Error> ) -> Result<R, Error>
where where
R: Send + 'static, R: Send + 'static,
@ -46,7 +46,7 @@ where
}; };
let proxy = event_loop.create_proxy(); 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)?; event_loop.run_app(&mut display_state)?;
@ -59,11 +59,11 @@ where
} }
/// # Fornjot model viewer /// # Fornjot model viewer
pub struct Viewer { pub struct ViewerHandle {
event_loop: EventLoopProxy<ToDisplay>, event_loop: EventLoopProxy<ToDisplay>,
} }
impl Viewer { impl ViewerHandle {
/// # Display a 2D face in a new window /// # Display a 2D face in a new window
pub fn display_face(&self, points: Vec<Point<2>>) { pub fn display_face(&self, points: Vec<Point<2>>) {
// If there's an error, that means the display thread has closed down // If there's an error, that means the display thread has closed down

4
experiments/2025-03-18/src/model.rs
View File

@ -1,6 +1,6 @@
use fj_interop::{Tolerance, TriMesh}; use fj_interop::{Tolerance, TriMesh};
use fj_math::Vector; use fj_math::Vector;
use fj_viewer::Viewer; use fj_viewer::ViewerHandle;
use crate::{ use crate::{
geometry::{FloatingCurve, Line, Sketch, SweptCurve}, geometry::{FloatingCurve, Line, Sketch, SweptCurve},
@ -9,7 +9,7 @@ use crate::{
topology::surface::Surface, topology::surface::Surface,
}; };
pub fn model(viewer: &Viewer) -> TriMesh { pub fn model(viewer: &ViewerHandle) -> TriMesh {
let tolerance = Tolerance::from(0.001); let tolerance = Tolerance::from(0.001);
let top = { let top = {