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

Prepare to manage multiple windows

Browse Source
This commit is contained in:
Hanno Braun 2025-03-28 19:19:02 +01:00
parent 938808966c
commit 1a36e6593a
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/fj-viewer/src/display.rs
View File

@ -1,7 +1,4 @@
use std::{
collections::BTreeMap,
sync::mpsc::{Receiver, sync_channel},
};
use std::{collections::BTreeMap, sync::mpsc::Receiver};
use fj_interop::TriMesh;
use futures::executor::block_on;
@ -28,24 +25,18 @@ pub struct Viewer {}
impl Viewer {
/// # Construct a new model viewer
pub fn new(tri_mesh: TriMesh, invert_zoom: bool) -> Result<Viewer, Error> {
pub fn new(
tri_mesh: Receiver<TriMesh>,
invert_zoom: bool,
) -> Result<Viewer, Error> {
let event_loop = EventLoop::new()?;
let (tri_mesh_tx, tri_mesh_rx) = sync_channel(1);
let mut display_state = DisplayState {
next_tri_mesh: tri_mesh_rx,
next_tri_mesh: tri_mesh,
invert_zoom,
windows: BTreeMap::new(),
};
let Ok(()) = tri_mesh_tx.send(tri_mesh) else {
unreachable!(
"Receiver has not been dropped, so it's not possible for the \
send to fail."
);
};
event_loop.run_app(&mut display_state)?;
Ok(Viewer {})

12
crates/fj/src/instance.rs
View File

@ -1,4 +1,4 @@
use std::{error::Error as _, fmt};
use std::{error::Error as _, fmt, sync::mpsc::sync_channel};
use fj_core::{
Core,
@ -90,7 +90,15 @@ impl Instance {
return Ok(());
}
Viewer::new(mesh, false)?;
let (tri_mesh_tx, tri_mesh_rx) = sync_channel(1);
let Ok(()) = tri_mesh_tx.send(mesh) else {
unreachable!(
"Receiver has not been dropped, so it's not possible for the \
send to fail."
);
};
Viewer::new(tri_mesh_rx, false)?;
Ok(())
}