This commit is contained in:
nora 2023-04-18 12:18:43 +02:00
parent eaf21b6a69
commit 4c53037082
4 changed files with 4 additions and 30 deletions

27
Cargo.lock generated
View file

@ -53,17 +53,6 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" 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]] [[package]]
name = "ecolor" name = "ecolor"
version = "0.21.0" version = "0.21.0"
@ -97,7 +86,7 @@ source = "git+https://github.com/crumblingstatue/egui-inspect.git#77b02370966aad
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.15", "syn",
] ]
[[package]] [[package]]
@ -141,7 +130,6 @@ dependencies = [
name = "mantle-diver" name = "mantle-diver"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"derivative",
"egui", "egui",
"egui-inspect", "egui-inspect",
"serde", "serde",
@ -241,7 +229,7 @@ checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.15", "syn",
] ]
[[package]] [[package]]
@ -250,17 +238,6 @@ version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" 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]] [[package]]
name = "syn" name = "syn"
version = "2.0.15" version = "2.0.15"

View file

@ -6,7 +6,6 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
derivative = "2.2.0"
egui = "0.21.0" egui = "0.21.0"
serde = { version = "1.0.160", features = ["derive"] } serde = { version = "1.0.160", features = ["derive"] }

View file

@ -1,12 +1,10 @@
use crate::tiles::TileDb; use crate::tiles::TileDb;
use derivative::Derivative;
use egui_inspect::derive::Inspect; use egui_inspect::derive::Inspect;
#[derive(Clone, Copy, Debug, Inspect)] #[derive(Clone, Copy, Debug, Inspect)]
pub(crate) struct WorldPos {} pub(crate) struct WorldPos {}
#[derive(Derivative, Inspect)] #[derive(Debug, Inspect)]
#[derivative(Debug)]
pub(crate) struct GameState { pub(crate) struct GameState {
pub(crate) camera_offset: WorldPos, pub(crate) camera_offset: WorldPos,
pub(crate) tile_db: TileDb, pub(crate) tile_db: TileDb,

View file

@ -18,7 +18,7 @@ fn main() {
do_debug_ui(&mut app.game); 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| { show(&|ui| {
game.inspect_mut(ui, 0); game.inspect_mut(ui, 0);
}); });