From 9f3d739e343d7d874ceaac69bbd8d0a0d7031142 Mon Sep 17 00:00:00 2001 From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> Date: Mon, 17 Apr 2023 22:11:06 +0200 Subject: [PATCH] more --- src/bitmanip.rs | 2 -- src/cmdline.rs | 2 -- src/debug.rs | 24 ++++++------------------ src/main.rs | 1 - 4 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 src/bitmanip.rs delete mode 100644 src/cmdline.rs diff --git a/src/bitmanip.rs b/src/bitmanip.rs deleted file mode 100644 index a9fa62f..0000000 --- a/src/bitmanip.rs +++ /dev/null @@ -1,2 +0,0 @@ -use std::ops::{BitAndAssign, BitOrAssign}; -use num_traits::PrimInt; diff --git a/src/cmdline.rs b/src/cmdline.rs deleted file mode 100644 index 387e687..0000000 --- a/src/cmdline.rs +++ /dev/null @@ -1,2 +0,0 @@ -use clap::Parser; -use crate::{command::Cmd, math::WorldPos}; diff --git a/src/debug.rs b/src/debug.rs index 0c50444..1f7b38a 100644 --- a/src/debug.rs +++ b/src/debug.rs @@ -1,5 +1,6 @@ -use crate::{command::CmdVec, game::GameState}; +use crate::game::GameState; use egui_inspect::{derive::Inspect, inspect}; + #[derive(Default, Debug, Inspect)] pub(crate) struct DebugState {} fn debug_panel_ui( @@ -9,22 +10,10 @@ fn debug_panel_ui( mut scale: &mut u8, ) { egui::Window::new("Debug (F12)").show(ctx, |ui| { - egui::ScrollArea::both() - .id_source("insp_scroll") - .max_height(240.) - .max_width(340.0) - .show(ui, |ui| { - inspect! { - ui, scale, game, debug - } - }); - egui::ScrollArea::vertical().show(ui, |ui| { - gamedebug_core::for_each_imm(|info| match info { - gamedebug_core::Info::Msg(msg) => { - ui.label(msg); - } - gamedebug_core::Info::Rect(_, _, _, _, _) => todo!(), - }); + egui::ScrollArea::both().show(ui, |ui| { + inspect! { + ui, scale, game, debug + } }); }); } @@ -33,7 +22,6 @@ pub(crate) fn do_debug_ui( debug: &mut DebugState, game: &mut GameState, scale: &mut u8, - cmd: &mut CmdVec, ) { debug_panel_ui(debug, game, ctx, scale); } diff --git a/src/main.rs b/src/main.rs index 0588165..e778bbd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -31,7 +31,6 @@ fn main() { &mut app.debug, &mut app.game, &mut app.scale, - &mut app.cmdvec, ); }) .unwrap();