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

Allow user thread to return a result

Browse Source
This commit is contained in:
Hanno Braun 2025-03-28 20:04:01 +01:00
parent 65104a4416
commit 8cc992d3b8
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
use std::{collections::BTreeMap, thread};
use std::{collections::BTreeMap, panic, thread};
use fj_interop::TriMesh;
use futures::executor::block_on;
@ -32,9 +32,12 @@ 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) + Send + 'static,
) -> Result<(), Error> {
pub fn make_viewer_and_spawn_thread<R>(
f: impl FnOnce(Viewer) -> R + Send + 'static,
) -> Result<R, Error>
where
R: Send + 'static,
{
let mut builder = EventLoop::with_user_event();
let event_loop = builder.build()?;
@ -43,11 +46,16 @@ pub fn make_viewer_and_spawn_thread(
};
let proxy = event_loop.create_proxy();
thread::spawn(|| f(Viewer { event_loop: proxy }));
let handle = thread::spawn(|| f(Viewer { event_loop: proxy }));
event_loop.run_app(&mut display_state)?;
Ok(())
let result = match handle.join() {
Ok(result) => result,
Err(payload) => panic::resume_unwind(payload),
};
Ok(result)
}
/// # Fornjot model viewer