From 4c53037082037cd9428443766d66edbb3588d564 Mon Sep 17 00:00:00 2001 From: nils <48135649+Nilstrieb@users.noreply.github.com> Date: Tue, 18 Apr 2023 12:18:43 +0200 Subject: [PATCH] more --- Cargo.lock | 27 ++------------------------- Cargo.toml | 1 - src/game.rs | 4 +--- src/main.rs | 2 +- 4 files changed, 4 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f10ccea..42acc19 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -53,17 +53,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "ecolor" version = "0.21.0" @@ -97,7 +86,7 @@ source = "git+https://github.com/crumblingstatue/egui-inspect.git#77b02370966aad dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn", ] [[package]] @@ -141,7 +130,6 @@ dependencies = [ name = "mantle-diver" version = "0.1.0" dependencies = [ - "derivative", "egui", "egui-inspect", "serde", @@ -241,7 +229,7 @@ checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn", ] [[package]] @@ -250,17 +238,6 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.15" diff --git a/Cargo.toml b/Cargo.toml index f62b3e5..aafcc2c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -derivative = "2.2.0" egui = "0.21.0" serde = { version = "1.0.160", features = ["derive"] } diff --git a/src/game.rs b/src/game.rs index 8bffb74..91b382f 100644 --- a/src/game.rs +++ b/src/game.rs @@ -1,12 +1,10 @@ use crate::tiles::TileDb; -use derivative::Derivative; use egui_inspect::derive::Inspect; #[derive(Clone, Copy, Debug, Inspect)] pub(crate) struct WorldPos {} -#[derive(Derivative, Inspect)] -#[derivative(Debug)] +#[derive(Debug, Inspect)] pub(crate) struct GameState { pub(crate) camera_offset: WorldPos, pub(crate) tile_db: TileDb, diff --git a/src/main.rs b/src/main.rs index 08ce821..821b382 100644 --- a/src/main.rs +++ b/src/main.rs @@ -18,7 +18,7 @@ fn main() { do_debug_ui(&mut app.game); } -pub(crate) fn do_debug_ui(mut game: &mut GameState) { +pub(crate) fn do_debug_ui(game: &mut GameState) { show(&|ui| { game.inspect_mut(ui, 0); });