zenithsiz/zsw
1
0
Fork 0
mirror of https://github.com/Zenithsiz/zsw.git synced 2026-02-04 02:08:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added rudimentary frame timings gui.

Browse Source
This commit is contained in:
Filipe Rodrigues 2022-02-17 20:57:07 +00:00
parent 74e1277f58
commit a8f8ca1131
4 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -2530,6 +2530,7 @@ dependencies = [
"zsw-panels",
"zsw-playlist",
"zsw-profiles",
"zsw-renderer",
"zsw-side-effect-macros",
"zsw-util",
"zsw-wgpu",

1
zsw-settings-window/Cargo.toml
View File

@ -12,6 +12,7 @@ zsw-egui = {path = "../zsw-egui"}
zsw-panels = {path = "../zsw-panels"}
zsw-playlist = {path = "../zsw-playlist"}
zsw-profiles = {path = "../zsw-profiles"}
zsw-renderer = {path = "../zsw-renderer"}
zsw-side-effect-macros = {path = "../zsw-side-effect-macros"}
zsw-util = {path = "../zsw-util"}
zsw-wgpu = {path = "../zsw-wgpu"}

30
zsw-settings-window/src/lib.rs
View File

@ -57,7 +57,7 @@
use {
cgmath::{Point2, Vector2},
crossbeam::atomic::AtomicCell,
egui::Widget,
egui::{plot, Widget},
pollster::FutureExt,
winit::{
dpi::{PhysicalPosition, PhysicalSize},
@ -67,6 +67,7 @@ use {
zsw_panels::{Panel, PanelState, PanelStateImage, PanelStateImages, Panels},
zsw_playlist::{Playlist, PlaylistImage},
zsw_profiles::{Profile, Profiles},
zsw_renderer::Renderer,
zsw_side_effect_macros::side_effect,
zsw_util::{MightBlock, Rect},
zsw_wgpu::Wgpu,
@ -126,6 +127,7 @@ impl SettingsWindow {
panels: &'panels Panels,
playlist: &'playlist Playlist,
profiles: &'profiles Profiles,
renderer: &Renderer,
) -> ! {
// Create the inner data
// DEADLOCK: Caller ensures we can lock it
@ -168,6 +170,7 @@ impl SettingsWindow {
panels,
playlist,
profiles,
renderer,
&mut playlist_lock,
&mut panels_lock,
&mut profiles_lock,
@ -194,6 +197,7 @@ impl SettingsWindow {
panels: &'panels Panels,
playlist: &'playlist Playlist,
profiles: &'profiles Profiles,
renderer: &Renderer,
playlist_lock: &mut zsw_playlist::PlaylistLock<'playlist>,
panels_lock: &mut zsw_panels::PanelsLock<'panels>,
profiles_lock: &mut zsw_profiles::ProfilesLock<'profiles>,
@ -221,6 +225,7 @@ impl SettingsWindow {
panels,
playlist,
profiles,
renderer,
playlist_lock,
panels_lock,
profiles_lock,
@ -250,6 +255,7 @@ fn draw_settings_window<'playlist, 'panels, 'profiles>(
panels: &'panels Panels,
playlist: &'playlist Playlist,
profiles: &'profiles Profiles,
renderer: &Renderer,
playlist_lock: &mut zsw_playlist::PlaylistLock<'playlist>,
panels_lock: &mut zsw_panels::PanelsLock<'panels>,
profiles_lock: &mut zsw_profiles::ProfilesLock<'profiles>,
@ -272,6 +278,28 @@ fn draw_settings_window<'playlist, 'panels, 'profiles>(
profiles_lock,
);
});
ui.collapsing("Frame timings", |ui| {
let frame_timings = renderer.frame_timings().block_on();
let bars = frame_timings
.iter()
.enumerate()
.map(|(idx, frame)| plot::Bar::new(idx as f64, 1000.0 * frame.total.as_secs_f64()))
.collect();
let bar_chart = plot::BarChart::new(bars).name("Total");
plot::Plot::new("Frame timings (ms)")
.allow_drag(false)
.allow_zoom(false)
.show_x(false)
.show_y(true)
.show_background(false)
.view_aspect(2.0)
.show(ui, |plot_ui| {
plot_ui.bar_chart(bar_chart);
});
});
}
/// Draws the profile settings

2
zsw/src/app.rs
View File

@ -124,7 +124,7 @@ pub fn run(args: &Args) -> Result<(), anyhow::Error> {
// DEADLOCK: See above
thread_spawner.spawn("Settings window", || {
settings_window_runner
.run(settings_window.run(&wgpu, &egui, &window, &panels, &playlist, &profiles))
.run(settings_window.run(&wgpu, &egui, &window, &panels, &playlist, &profiles, &renderer))
.map::<!, _>(WithSideEffect::allow::<MightBlock>)
.into_err();
})?;