Skip to content

Commit

Permalink
Move StatusReport to fj-viewer
Browse files Browse the repository at this point in the history
Since more code has been moved out of the main loop into separate
threads, and communication has been replaced with channels,
`StatusReport` isn't as widely used anymore.
  • Loading branch information
hannobraun committed Nov 2, 2022
1 parent 48b031e commit ebd6555
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion crates/fj-interop/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ keywords.workspace = true
categories.workspace = true

[dependencies]
chrono = "0.4.22"
fj-math.workspace = true
1 change: 0 additions & 1 deletion crates/fj-interop/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ pub mod debug;
pub mod ext;
pub mod mesh;
pub mod processed_shape;
pub mod status_report;
1 change: 1 addition & 0 deletions crates/fj-viewer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ categories.workspace = true

[dependencies]
bytemuck = "1.12.2"
chrono = "0.4.22"
crossbeam-channel = "0.5.6"
egui = "0.19.0"
egui-wgpu = "0.19.0"
Expand Down
3 changes: 1 addition & 2 deletions crates/fj-viewer/src/gui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ use crossbeam_channel::{Receiver, Sender};
#[cfg(not(target_arch = "wasm32"))]
use rfd::FileDialog;

use fj_interop::status_report::StatusReport;
use fj_math::{Aabb, Scalar};

use crate::graphics::DrawConfig;
use crate::{graphics::DrawConfig, StatusReport};

struct GuiState {
has_model: bool,
Expand Down
2 changes: 2 additions & 0 deletions crates/fj-viewer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ mod graphics;
mod gui;
mod input;
mod screen;
mod status_report;
mod viewer;

pub use self::{
Expand All @@ -27,5 +28,6 @@ pub use self::{
gui::Gui,
input::{InputEvent, InputHandler},
screen::{NormalizedScreenPosition, Screen, ScreenSize},
status_report::StatusReport,
viewer::Viewer,
};
File renamed without changes.
5 changes: 2 additions & 3 deletions crates/fj-viewer/src/viewer.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
use std::path::PathBuf;

use fj_interop::{
processed_shape::ProcessedShape, status_report::StatusReport,
};
use fj_interop::processed_shape::ProcessedShape;
use fj_math::Aabb;
use tracing::warn;

Expand All @@ -11,6 +9,7 @@ use crossbeam_channel::{Receiver, Sender};
use crate::{
camera::FocusPoint, gui::Gui, Camera, DrawConfig, InputEvent, InputHandler,
NormalizedScreenPosition, Renderer, RendererInitError, Screen, ScreenSize,
StatusReport,
};

/// The Fornjot model viewer
Expand Down
3 changes: 1 addition & 2 deletions crates/fj-window/src/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@
use std::{error, path::PathBuf};

use fj_host::{Host, Model, ModelEvent, Parameters};
use fj_interop::status_report::StatusReport;
use fj_operations::shape_processor::ShapeProcessor;
use fj_viewer::{
InputEvent, NormalizedScreenPosition, RendererInitError, Screen,
ScreenSize, Viewer,
ScreenSize, StatusReport, Viewer,
};
use futures::executor::block_on;
use tracing::trace;
Expand Down

0 comments on commit ebd6555

Please sign in to comment.