Make tile db edit ui more bearable to use

src/debug.rs

@@ -12,14 +12,14 @@ use crate::{
     res::Res,
     stringfmt::LengthDisp,
     texture_atlas::AtlasBundle,
-    tiles::tiledb_edit_ui::tiledb_edit_ui,
+    tiles::tiledb_edit_ui::TileDbEdit,
 };
 
 #[derive(Default, Debug, Inspect)]
 pub struct DebugState {
     pub panel: bool,
     pub freecam: bool,
-    pub tiledb_edit: bool,
+    pub tiledb_edit: TileDbEdit,
     pub show_atlas: bool,
     pub console: Console,
 }
@@ -120,9 +120,7 @@ pub(crate) fn do_debug_ui(
     if debug.panel {
         debug_panel_ui(debug, game, ctx, res, scale);
     }
-    if debug.tiledb_edit {
+    debug.tiledb_edit.ui(ctx, &mut game.tile_db);
-        tiledb_edit_ui(ctx, &mut game.tile_db);
-    }
     if debug.console.show {
         console_ui(ctx, debug, cmd);
     }

src/tiles/tiledb_edit_ui.rs

@@ -1,29 +1,55 @@
 use std::fmt::Debug;
 
-use egui_inspect::Inspect;
+use egui_inspect::{derive::Inspect, Inspect};
 
 use crate::{
     graphics::{ScreenSc, ScreenVec},
     math::TILE_SIZE,
 };
 
-use super::{Bg, Fg, Mid, TileDb, TileDef, TileLayer, DEFAULT_TILE_BB};
+#[derive(Debug, Default, Inspect)]
-
+pub struct TileDbEdit {
-pub fn tiledb_edit_ui(ctx: &egui::Context, tile_db: &mut TileDb) {
+    open: bool,
+    #[opaque]
+    layer: Layer,
+}
+impl TileDbEdit {
+    pub(crate) fn ui(&mut self, ctx: &egui::Context, tile_db: &mut TileDb) {
+        if !self.open {
+            return;
+        }
         egui::Window::new("Tiledb editor").show(ctx, |ui| {
+            ui.horizontal(|ui| {
+                ui.selectable_value(&mut self.layer, Layer::Bg, "Bg");
+                ui.selectable_value(&mut self.layer, Layer::Mid, "Mid");
+                ui.selectable_value(&mut self.layer, Layer::Fg, "Fg");
+            });
             ui.separator();
             egui::ScrollArea::vertical()
                 .max_height(400.0)
-            .show(ui, |ui| {
+                .show(ui, |ui| match self.layer {
-                ui.heading("Bg");
+                    Layer::Bg => db_ui(&mut tile_db.bg, ui),
-                db_ui(&mut tile_db.bg, ui);
+                    Layer::Fg => db_ui(&mut tile_db.fg, ui),
-                ui.heading("Mid");
+                    Layer::Mid => db_ui(&mut tile_db.mid, ui),
-                db_ui(&mut tile_db.mid, ui);
-                ui.heading("Fg");
-                db_ui(&mut tile_db.fg, ui);
                 });
         });
     }
+}
+
+#[derive(Debug, PartialEq, Eq)]
+enum Layer {
+    Bg,
+    Fg,
+    Mid,
+}
+
+impl Default for Layer {
+    fn default() -> Self {
+        Self::Bg
+    }
+}
+
+use super::{Bg, Fg, Mid, TileDb, TileDef, TileLayer, DEFAULT_TILE_BB};
 
 trait SpecialUi {
     fn special_ui(&mut self, ui: &mut egui::Ui);
@@ -33,6 +59,7 @@ impl SpecialUi for TileDef<Mid> {
     fn special_ui(&mut self, ui: &mut egui::Ui) {
         match &mut self.layer.bb {
             Some(bb) => {
+                ui.horizontal(|ui| {
                     ui.label("x");
                     ui.add(egui::DragValue::new(&mut bb.x));
                     ui.label("y");
@@ -41,6 +68,7 @@ impl SpecialUi for TileDef<Mid> {
                     ui.add(egui::DragValue::new(&mut bb.w));
                     ui.label("h");
                     ui.add(egui::DragValue::new(&mut bb.h));
+                });
             }
             None => {
                 if ui.button("Insert bb").clicked() {
@@ -48,6 +76,7 @@ impl SpecialUi for TileDef<Mid> {
                 }
             }
         }
+        ui.checkbox(&mut self.layer.platform, "platform");
     }
 }
 
@@ -66,12 +95,15 @@ where
 {
     for (i, def) in db.iter_mut().enumerate() {
         ui.label(i.to_string());
+        ui.text_edit_singleline(&mut def.graphic_name);
         match &mut def.light {
             Some(light) => {
+                ui.horizontal(|ui| {
                     ui.label("x");
                     ui.add(egui::DragValue::new(&mut light.x));
                     ui.label("y");
                     ui.add(egui::DragValue::new(&mut light.y));
+                });
             }
             None => {
                 if ui.button("Insert light emit").clicked() {
@@ -83,8 +115,8 @@ where
             }
         }
         def.special_ui(ui);
-    }
         ui.separator();
+    }
     if ui.button("Add new default").clicked() {
         db.push(Default::default());
     }