From 20c03b4e5bf82509dde6a64cd7c3e81f7d4aa017 Mon Sep 17 00:00:00 2001 From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> Date: Mon, 17 Apr 2023 22:12:36 +0200 Subject: [PATCH] more --- src/debug.rs | 22 +++++----------------- src/main.rs | 3 --- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/debug.rs b/src/debug.rs index 1f7b38a..0740231 100644 --- a/src/debug.rs +++ b/src/debug.rs @@ -1,27 +1,15 @@ use crate::game::GameState; -use egui_inspect::{derive::Inspect, inspect}; +use egui_inspect::inspect; -#[derive(Default, Debug, Inspect)] -pub(crate) struct DebugState {} -fn debug_panel_ui( - mut debug: &mut DebugState, - mut game: &mut GameState, - ctx: &egui::Context, - mut scale: &mut u8, -) { +fn debug_panel_ui(mut game: &mut GameState, ctx: &egui::Context, mut scale: &mut u8) { egui::Window::new("Debug (F12)").show(ctx, |ui| { egui::ScrollArea::both().show(ui, |ui| { inspect! { - ui, scale, game, debug + ui, scale, game } }); }); } -pub(crate) fn do_debug_ui( - ctx: &egui::Context, - debug: &mut DebugState, - game: &mut GameState, - scale: &mut u8, -) { - debug_panel_ui(debug, game, ctx, scale); +pub(crate) fn do_debug_ui(ctx: &egui::Context, game: &mut GameState, scale: &mut u8) { + debug_panel_ui(game, ctx, scale); } diff --git a/src/main.rs b/src/main.rs index 0b2bb1e..f4f7573 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,3 @@ -use debug::DebugState; use egui_sfml::SfEgui; use game::GameState; @@ -9,7 +8,6 @@ mod tiles; pub(crate) struct App { pub(crate) game: GameState, pub(crate) sf_egui: SfEgui, - pub(crate) debug: DebugState, /// Integer scale for rendering the game pub(crate) scale: u8, } @@ -25,7 +23,6 @@ fn main() { .do_frame(|ctx| { debug::do_debug_ui( ctx, - &mut app.debug, &mut app.game, &mut app.scale, );