tirbofish/dropbear · commit
57feb694883e38f589160f9a119acb0009c09290
performance menu (nerd stats). jarvis, run github actions
Signature present but could not be verified.
Unverified
@@ -19,13 +19,13 @@ clap = "4.5" colored = "3.0" crossbeam-channel = "0.5" dropbear-engine = { path = "dropbear-engine" } -egui = "0.32" -egui-toast = "0.18" -egui-wgpu = { version = "0.32" } -egui-winit = { version = "0.32" } -egui_dnd = "0.13" -egui_dock = { version = "0.17", features = ["serde"] } -egui_extras = { version = "0.32", features = ["all_loaders"] } +egui = "0.33" +egui-toast = { git = "https://github.com/LazerSharkk/egui-toast" } +egui-wgpu = { version = "0.33" } +egui-winit = { version = "0.33" } +egui_dnd = "0.14" +egui_dock = { version = "0.18", features = ["serde"] } +egui_extras = { version = "0.33", features = ["all_loaders"] } env_logger = "0.11" futures = "0.3" gilrs = "0.11" @@ -35,27 +35,27 @@ hecs = { version = "0.10", features = ["serde"] } lazy_static = "1.5" log = "0.4" log-once = "0.4" -model_to_image = "0.1.1" +model_to_image = "0.1" once_cell = "1.21" parking_lot = {version = "0.12", features = ["deadlock_detection"] } -rfd = "0.15.4" +rfd = "0.15" ron = "0.11" -serde = { version = "1.0.219", features = ["derive"] } +serde = { version = "1.0", features = ["derive"] } spin_sleep = "1.3" -transform-gizmo-egui = { version = "0.7" } +transform-gizmo-egui = { git = "https://github.com/kisya-games/transform-gizmo", branch = "egui-0.33" } tokio = { version = "1", features = ["full"] } -wgpu = "25" +wgpu = "27" winit = { version = "0.30", features = [] } -zip = "5.1" -walkdir = "2.3" +zip = "6.0" +walkdir = "2.5" rayon = "1.11" backtrace = "0.3" gltf = "1" os_info = "3.12" rustc_version_runtime = "0.3" jni = { version = "0.21", features = ["invocation"] } -tree-sitter = "0.22" -tree-sitter-kotlin = "0.3.8" +tree-sitter = "0.22" # must be kept as 0.22 because tree-sitter-kotlin has not been updated +tree-sitter-kotlin = "0.3" libloading = "0.8" indexmap = "2.11" sha2 = "0.10" @@ -77,14 +77,6 @@ codegen-units = 16 incremental = true lto = false +# makes the debug builds so much more faster [profile.dev.package."*"] -opt-level = 3 - -# [profile.release] -# opt-level = 3 -# lto = true -# codegen-units = 1 -# strip = true -# panic = "abort" -# debug = false -# incremental = false +opt-level = 3 @@ -45,9 +45,6 @@ dashmap.workspace = true rfd.workspace = true arboard.workspace = true -# [target.'cfg(target_os = "android")'.dependencies] -# android_logger = "0.15" - [dependencies.image] version = "0.25" default-features = false @@ -1,6 +1,6 @@ use egui::Context; use egui_wgpu::wgpu::{CommandEncoder, Device, Queue, StoreOp, TextureFormat, TextureView}; -use egui_wgpu::{Renderer, ScreenDescriptor, wgpu}; +use egui_wgpu::{Renderer, ScreenDescriptor, wgpu, RendererOptions}; use egui_winit::State; use winit::event::WindowEvent; use winit::window::Window; @@ -37,12 +37,16 @@ impl EguiRenderer { None, Some(2 * 1024), // default dimension is 2048 ); + let options = RendererOptions { + msaa_samples, + depth_stencil_format: output_depth_format, + dithering: true, + predictable_texture_filtering: false, + }; let egui_renderer = Renderer::new( device, output_color_format, - output_depth_format, - msaa_samples, - true, + options, ); EguiRenderer { @@ -99,6 +103,7 @@ impl EguiRenderer { let rpass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { color_attachments: &[Some(wgpu::RenderPassColorAttachment { view: window_surface_view, + depth_slice: None, resolve_target: None, ops: egui_wgpu::wgpu::Operations { load: egui_wgpu::wgpu::LoadOp::Load, @@ -195,6 +195,7 @@ impl<'a> RenderContext<'a> { label: Some("Render Pass"), color_attachments: &[Some(wgpu::RenderPassColorAttachment { view: self.frame.view, + depth_slice: None, resolve_target: None, ops: wgpu::Operations { load: wgpu::LoadOp::Clear(color), @@ -222,6 +223,7 @@ impl<'a> RenderContext<'a> { label: Some("Render Pass"), color_attachments: &[Some(wgpu::RenderPassColorAttachment { view: self.frame.view, + depth_slice: None, resolve_target: None, ops: wgpu::Operations { load: wgpu::LoadOp::Load, @@ -16,6 +16,8 @@ pub mod scene; pub mod shader; pub mod utils; +pub static WGPU_BACKEND: OnceLock<String> = OnceLock::new(); + use app_dirs2::{AppDataType, AppInfo}; use bytemuck::Contiguous; use chrono::Local; @@ -39,10 +41,8 @@ use std::{ sync::Arc, time::{Duration, Instant, SystemTime, UNIX_EPOCH}, }; -use wgpu::{ - BindGroupLayout, Device, Instance, Queue, Surface, SurfaceConfiguration, SurfaceError, - TextureFormat, -}; +use std::sync::{OnceLock}; +use wgpu::{BindGroupLayout, Device, ExperimentalFeatures, Instance, Queue, Surface, SurfaceConfiguration, SurfaceError, TextureFormat}; use winit::event::{DeviceEvent, DeviceId}; use winit::{ application::ApplicationHandler, @@ -105,6 +105,7 @@ impl State { label: None, required_features: wgpu::Features::empty(), required_limits: wgpu::Limits::default(), + experimental_features: unsafe { ExperimentalFeatures::enabled() }, memory_hints: Default::default(), trace: wgpu::Trace::Off, }) @@ -152,6 +153,8 @@ Hardware: ); let surface_caps = surface.get_capabilities(&adapter); + WGPU_BACKEND.set(format!("{}", info.backend)).unwrap(); + let surface_format = surface_caps .formats .iter() @@ -651,7 +651,7 @@ impl<'a> TabViewer for EditorTabViewer<'a> { let image_response = card_ui.add_sized( [image_size, image_size], - egui::ImageButton::new(image.clone()).frame(false), + egui::Button::image(image.clone()).frame(false), ); let is_hovered = card_response.hovered() || image_response.hovered() || state.dragged; @@ -901,7 +901,7 @@ impl Editor { } if ui.button("Nerdy Stuff").clicked() { - self.show_nerdy_stuff = true + self.nerd_stats.show_window = true } if ui.button("About").clicked() { @@ -985,7 +985,7 @@ impl Editor { ui.label( egui::RichText::new(format!( - "Built on commit {} with rustc {}", + "Built on commit {} with {}", env!("GIT_HASH"), rustc_version_runtime::version_meta().short_version_string )) @@ -269,7 +269,7 @@ impl Scene for Editor { .update(graphics.shared.clone(), &self.world); } - self.nerd_stats.update(dt); + self.nerd_stats.update(dt, self.world.len()); self.input_state.window = self.window.clone(); self.previously_selected_entity = self.selected_entity; @@ -1,10 +1,15 @@ use std::{collections::VecDeque, time::Instant}; -use egui::{Context, RichText}; +use egui::{Color32, Context, RichText}; +use egui_plot::{Legend, Line, Plot, PlotPoints}; +use dropbear_engine::WGPU_BACKEND; + +pub const EGUI_VERSION: &str = "0.33"; +pub const WGPU_VERSION: &str = "27"; /// Statistics for checking performance of the editor. pub struct NerdStats { - show_window: bool, + pub show_window: bool, fps_history: VecDeque<[f64; 2]>, frame_times: VecDeque<f64>, @@ -21,6 +26,7 @@ pub struct NerdStats { min_fps: f32, max_fps: f32, avg_fps: f32, + entity_count: u32, } impl Default for NerdStats { @@ -38,13 +44,14 @@ impl Default for NerdStats { max_fps: 0.0, avg_fps: 0.0, show_window: false, + entity_count: 0, } } } impl NerdStats { /// Updates all information in [`NerdStats`] with the deltatime provided by the scene - pub fn update(&mut self, dt: f32) { + pub fn update(&mut self, dt: f32, entity_count: u32) { self.total_frames += 1; let elapsed = self.start_time.elapsed().as_secs_f64(); @@ -54,33 +61,31 @@ impl NerdStats { self.frame_times.pop_front(); } - if self.last_fps_update.elapsed().as_secs_f32() >= 0.1 { - if dt > 0.0 { - self.current_fps = 1.0 / dt; - - self.min_fps = self.min_fps.min(self.current_fps); - self.max_fps = self.max_fps.max(self.current_fps); - - if !self.frame_times.is_empty() { - let avg_frame_time: f64 = self.frame_times.iter().sum::<f64>() / self.frame_times.len() as f64; - self.avg_fps = (1.0 / avg_frame_time) as f32; - } - - self.fps_history.push_back([elapsed, self.current_fps as f64]); - if self.fps_history.len() > 300 { - self.fps_history.pop_front(); - } - - self.frame_time_history.push_back([elapsed, frame_time_ms]); - if self.frame_time_history.len() > 300 { - self.frame_time_history.pop_front(); - } - - self.last_fps_update = Instant::now(); + if self.last_fps_update.elapsed().as_secs_f32() >= 0.1 && dt > 0.0 { + self.current_fps = 1.0 / dt; + + self.min_fps = self.min_fps.min(self.current_fps); + self.max_fps = self.max_fps.max(self.current_fps); + + if !self.frame_times.is_empty() { + let avg_frame_time: f64 = self.frame_times.iter().sum::<f64>() / self.frame_times.len() as f64; + self.avg_fps = (1.0 / avg_frame_time) as f32; } + + self.fps_history.push_back([elapsed, self.current_fps as f64]); + if self.fps_history.len() > 300 { + self.fps_history.pop_front(); + } + + self.frame_time_history.push_back([elapsed, frame_time_ms]); + if self.frame_time_history.len() > 300 { + self.frame_time_history.pop_front(); + } + + self.last_fps_update = Instant::now(); } - - if self.total_frames % 30 == 0 { + + if self.total_frames.is_multiple_of(30) { let memory_mb = if let Some(usage) = memory_stats::memory_stats() { (usage.physical_mem / 1024 / 1024) as f64 } else { @@ -92,6 +97,7 @@ impl NerdStats { self.memory_history.pop_front(); } } + self.entity_count = entity_count; } /// Resets statistics to their defaults @@ -107,18 +113,19 @@ impl NerdStats { /// Shows the egui window pub fn show(&mut self, ctx: &Context) { - egui::Window::new("Nerdy Stuff 🤓") + let mut show_window = self.show_window.clone(); + egui::Window::new("Nerdy Statistics") .resizable(true) .collapsible(false) .default_size([600.0, 500.0]) - .open(show_nerdy_stuff) + .open(&mut show_window) .show(ctx, |ui| { ui.vertical(|ui| { ui.horizontal(|ui| { ui.heading("Performance Monitor"); ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { if ui.button("Reset Stats").clicked() { - stats.reset_stats(); + self.reset_stats(); } }); }); @@ -128,15 +135,15 @@ impl NerdStats { ui.horizontal(|ui| { ui.vertical(|ui| { ui.label(RichText::new("Current FPS").strong()); - let fps_color = if stats.current_fps >= 60.0 { + let fps_color = if self.current_fps >= 60.0 { Color32::GREEN - } else if stats.current_fps >= 30.0 { + } else if self.current_fps >= 30.0 { Color32::YELLOW } else { Color32::RED }; ui.label( - RichText::new(format!("{:.1}", stats.current_fps)) + RichText::new(format!("{:.1}", self.current_fps)) .size(24.0) .color(fps_color) ); @@ -147,7 +154,7 @@ impl NerdStats { ui.vertical(|ui| { ui.label(RichText::new("Frame Time").strong()); ui.label( - RichText::new(format!("{:.2} ms", 1000.0 / stats.current_fps.max(1.0))) + RichText::new(format!("{:.2} ms", 1000.0 / self.current_fps.max(1.0))) .size(24.0) ); }); @@ -157,7 +164,17 @@ impl NerdStats { ui.vertical(|ui| { ui.label(RichText::new("Avg FPS").strong()); ui.label( - RichText::new(format!("{:.1}", stats.avg_fps)) + RichText::new(format!("{:.1}", self.avg_fps)) + .size(24.0) + ); + }); + + ui.separator(); + + ui.vertical(|ui| { + ui.label(RichText::new("Entity Count").strong()); + ui.label( + RichText::new(format!("{} entities", self.entity_count)) .size(24.0) ); }); @@ -166,13 +183,13 @@ impl NerdStats { ui.add_space(5.0); ui.horizontal(|ui| { - ui.label(format!("Min: {:.1} fps", stats.min_fps)); + ui.label(format!("Min: {:.1} fps", self.min_fps)); ui.separator(); - ui.label(format!("Max: {:.1} fps", stats.max_fps)); + ui.label(format!("Max: {:.1} fps", self.max_fps)); ui.separator(); - ui.label(format!("Total Frames: {}", stats.total_frames)); + ui.label(format!("Total Frames: {}", self.total_frames)); ui.separator(); - ui.label(format!("Uptime: {:.1}s", stats.start_time.elapsed().as_secs_f32())); + ui.label(format!("Uptime: {:.1}s", self.start_time.elapsed().as_secs_f32())); }); ui.separator(); @@ -184,26 +201,27 @@ impl NerdStats { .show_grid([false, true]) .legend(Legend::default()) .show(ui, |plot_ui| { - if !stats.fps_history.is_empty() { - let points: Vec<[f64; 2]> = stats.fps_history.iter().cloned().collect(); + if !self.fps_history.is_empty() { + let points: Vec<[f64; 2]> = self.fps_history.iter().cloned().collect(); plot_ui.line( - Line::new(PlotPoints::from(points)) + Line::new("fps", PlotPoints::from(points)) .color(Color32::from_rgb(100, 200, 100)) .name("FPS") ); + + let first = self.fps_history.front().copied(); + let last = self.fps_history.back().copied(); - if let Some(first) = stats.fps_history.front() { - if let Some(last) = stats.fps_history.back() { - plot_ui.line( - Line::new(PlotPoints::from(vec![ - [first[0], 60.0], - [last[0], 60.0] - ])) - .color(Color32::from_rgba_unmultiplied(255, 255, 0, 100)) - .style(egui_plot::LineStyle::Dashed { length: 5.0 }) - .name("60 FPS Target") - ); - } + if let Some(first) = first && let Some(last) = last { + plot_ui.line( + Line::new("60 fps target", PlotPoints::from(vec![ + [*first.get(0).unwrap(), 60.0], + [*last.get(0).unwrap(), 60.0] + ])) + .color(Color32::from_rgba_unmultiplied(255, 255, 0, 100)) + .style(egui_plot::LineStyle::Dashed { length: 5.0 }) + .name("60 FPS Target") + ); } } }); @@ -217,26 +235,28 @@ impl NerdStats { .show_grid([false, true]) .legend(Legend::default()) .show(ui, |plot_ui| { - if !stats.frame_time_history.is_empty() { - let points: Vec<[f64; 2]> = stats.frame_time_history.iter().cloned().collect(); + if !self.frame_time_history.is_empty() { + let points: Vec<[f64; 2]> = self.frame_time_history.iter().cloned().collect(); plot_ui.line( - Line::new(PlotPoints::from(points)) + Line::new("frametime", PlotPoints::from(points)) .color(Color32::from_rgb(100, 150, 255)) .name("Frame Time (ms)") ); + + let first = self.frame_time_history.front().copied(); + let last = self.frame_time_history.back().copied(); - if let Some(first) = stats.frame_time_history.front() { - if let Some(last) = stats.frame_time_history.back() { - plot_ui.line( - Line::new(PlotPoints::from(vec![ - [first[0], 16.67], - [last[0], 16.67] - ])) - .color(Color32::from_rgba_unmultiplied(255, 255, 0, 100)) - .style(egui_plot::LineStyle::Dashed { length: 5.0 }) - .name("16.67ms (60 FPS)") - ); - } + if let Some(first) = first && let Some(last) = last + { + plot_ui.line( + Line::new("frametime_base", PlotPoints::from(vec![ + [*first.get(0).unwrap(), 16.67], + [*last.get(0).unwrap(), 16.67] + ])) + .color(Color32::from_rgba_unmultiplied(255, 255, 0, 100)) + .style(egui_plot::LineStyle::Dashed { length: 5.0 }) + .name("16.67ms (60 FPS)") + ); } } }); @@ -250,10 +270,10 @@ impl NerdStats { .show_grid([false, true]) .legend(Legend::default()) .show(ui, |plot_ui| { - if !stats.memory_history.is_empty() { - let points: Vec<[f64; 2]> = stats.memory_history.iter().cloned().collect(); + if !self.memory_history.is_empty() { + let points: Vec<[f64; 2]> = self.memory_history.iter().cloned().collect(); plot_ui.line( - Line::new(PlotPoints::from(points)) + Line::new("memory", PlotPoints::from(points)) .color(Color32::from_rgb(255, 150, 100)) .name("Memory (MB)") ); @@ -264,11 +284,11 @@ impl NerdStats { ui.collapsing("System Information", |ui| { ui.horizontal(|ui| { ui.label("egui version:"); - ui.label(egui::VERSION); + ui.label(EGUI_VERSION); }); ui.horizontal(|ui| { ui.label("Backend:"); - ui.label("wgpu"); + ui.label(WGPU_BACKEND.get().unwrap()); }); ui.horizontal(|ui| { ui.label("OS:"); @@ -281,5 +301,9 @@ impl NerdStats { }); }); }); + + if show_window != self.show_window { + self.show_window = show_window; + } } }