Remove map (#15)

* remove 1

* remove rest

Author: rfuzzo

src/app.rs

@@ -2,36 +2,11 @@ use std::path::PathBuf;
 #[cfg(target_arch = "wasm32")]
 use std::{cell::RefCell, rc::Rc};
 
-use egui::Pos2;
 use egui_notify::Toasts;
 use serde::{Deserialize, Serialize};
 use tes3::esp::Plugin;
 
-use crate::{
-    get_unique_id, CompareData, EAppState, EModalState, EScale, EditData, MapData, PluginMetadata,
-};
-
-#[derive(Debug, Clone, Copy)]
-pub struct ZoomData {
-    pub drag_start: Pos2,
-    pub drag_delta: Option<Pos2>,
-    pub drag_offset: Pos2,
-
-    pub zoom: f32,
-    pub zoom_delta: Option<f32>,
-}
-
-impl Default for ZoomData {
-    fn default() -> Self {
-        Self {
-            drag_start: Default::default(),
-            drag_delta: Default::default(),
-            drag_offset: Default::default(),
-            zoom: 1.0,
-            zoom_delta: Default::default(),
-        }
-    }
-}
+use crate::{get_unique_id, CompareData, EAppState, EModalState, EScale, EditData, PluginMetadata};
 
 /// We derive Deserialize/Serialize so we can persist app state on shutdown.
 #[derive(Deserialize, Serialize)]
@@ -53,8 +28,6 @@ pub struct TemplateApp {
     pub edit_data: EditData,
     #[serde(skip)]
     pub compare_data: CompareData,
-    #[serde(skip)]
-    pub map_data: MapData,
 
     // runtime ui
     #[serde(skip)]
@@ -66,9 +39,6 @@ pub struct TemplateApp {
     #[serde(skip)]
     pub modal_state: EModalState,
 
-    #[serde(skip)]
-    pub zoom_data: ZoomData,
-
     // wasm
     // https://github.com/ergrelet/resym/blob/e4d243eb9459211ade0c5bae16096712a0615b0b/resym/src/resym_app.rs
     /// Field used by wasm32 targets to store file information
@@ -89,7 +59,6 @@ impl Default for TemplateApp {
             last_directory: "/".into(),
             // runtime data
             compare_data: CompareData::default(),
-            map_data: MapData::default(),
             edit_data: EditData::default(),
             // settings
             overwrite: false,
@@ -101,7 +70,6 @@ impl Default for TemplateApp {
             app_state: EAppState::default(),
             modal_state: EModalState::default(),
             modal_open: false,
-            zoom_data: ZoomData::default(),
 
             #[cfg(target_arch = "wasm32")]
             open_file_data: Rc::new(RefCell::new(None)),
@@ -196,9 +164,6 @@ impl TemplateApp {
     pub(crate) fn open_modal_window(&mut self, ui: &mut egui::Ui, modal: EModalState) {
         // cleanup
         self.compare_data = CompareData::default();
-        let last_path = self.map_data.path.clone();
-        self.map_data = MapData::default();
-        self.map_data.path = last_path;
 
         // disable ui
         ui.set_enabled(false);
@@ -213,20 +178,6 @@ impl TemplateApp {
         self.modal_open = false;
         self.modal_state = EModalState::None;
     }
-
-    /// Settings popup menu
-    pub(crate) fn options_ui(&mut self, ui: &mut egui::Ui) {
-        if ui.button("Refresh").clicked() {
-            self.map_data.refresh_requested = true;
-        }
-
-        ui.separator();
-        ui.label("Overlays");
-        ui.checkbox(&mut self.map_data.overlay_conflicts, "Show conflicts");
-        ui.checkbox(&mut self.map_data.overlay_region, "Show regions");
-        ui.checkbox(&mut self.map_data.overlay_travel, "Show travel");
-        ui.checkbox(&mut self.map_data.tooltip_names, "Show tooltips");
-    }
 }
 
 impl eframe::App for TemplateApp {
@@ -244,15 +195,13 @@ impl eframe::App for TemplateApp {
             match self.modal_state {
                 EModalState::None => panic!("ArgumentException"),
                 EModalState::ModalCompareInit => self.update_modal_compare(ctx),
-                EModalState::MapInit => self.update_modal_map(ctx),
                 EModalState::Settings => self.update_settings(ctx),
             }
         } else {
             // other main ui views
             match self.app_state {
                 EAppState::Main => self.update_edit_view(ctx),
                 EAppState::Compare => self.update_compare_view(ctx, frame),
-                EAppState::Map => self.update_map_view(ctx),
             }
         }
 

src/app_ui.rs

@@ -1,6 +1,6 @@
 use tes3::esp::Plugin;
 
-use crate::{get_cell_name, TemplateApp};
+use crate::TemplateApp;
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 
@@ -122,93 +122,4 @@ impl TemplateApp {
             self.conflict_compare_view(ui);
         });
     }
-
-    /// Main map view
-    pub fn update_map_view(&mut self, ctx: &egui::Context) {
-        // Top Panel
-        let mut skip = false;
-        egui::TopBottomPanel::top("top_panel_map").show(ctx, |ui| {
-            egui::menu::bar(ui, |ui| {
-                if self.map_data.refresh_requested {
-                    // exit
-                    self.open_modal_window(ui, crate::EModalState::MapInit);
-                    skip = true;
-                }
-
-                if ui.button("Exit").clicked() {
-                    self.app_state = crate::EAppState::Main;
-                    skip = true;
-                }
-            });
-        });
-
-        if skip {
-            return;
-        }
-
-        // Side Panel
-        egui::SidePanel::right("side_panel_map").show(ctx, |ui| {
-            // heading
-            ui.heading("Cells");
-            ui.separator();
-
-            // search bar
-            ui.horizontal(|ui| {
-                ui.label("Filter: ");
-                ui.text_edit_singleline(&mut self.edit_data.search_text);
-            });
-            ui.separator();
-
-            // list of cells
-            egui::ScrollArea::vertical().show(ui, |ui| {
-                let mut ids: Vec<&String> = self.map_data.cell_ids.keys().collect::<Vec<_>>();
-                ids.sort();
-
-                for key in ids.iter() {
-                    // TODO upper and lowercase search
-                    if !self.edit_data.search_text.is_empty()
-                        && !key
-                            .to_lowercase()
-                            .contains(&self.edit_data.search_text.to_lowercase())
-                    {
-                        continue;
-                    }
-
-                    if self.map_data.selected_id == key.to_string() {
-                        ui.visuals_mut().override_text_color = Some(egui::Color32::RED);
-                    } else {
-                        ui.visuals_mut().override_text_color = None;
-                    }
-
-                    let response =
-                        ui.add(egui::Label::new(&(*key).clone()).sense(egui::Sense::click()));
-                    if response.clicked() {
-                        self.map_data.selected_id = key.to_string();
-                    }
-                }
-            });
-        });
-
-        // footer
-        egui::TopBottomPanel::bottom("bottom_panel").show(ctx, |ui| {
-            // Status Bar
-            ui.horizontal(|ui| {
-                // map bounds
-                ui.label(format!(
-                    "({},{}) - ({},{})",
-                    self.map_data.bounds_x.0,
-                    self.map_data.bounds_y.0,
-                    self.map_data.bounds_x.1,
-                    self.map_data.bounds_y.1
-                ));
-                ui.separator();
-                ui.label(get_cell_name(&self.map_data, self.map_data.hover_pos));
-            });
-        });
-
-        // Central Panel
-        egui::CentralPanel::default().show(ctx, |ui| {
-            self.map_view(ui);
-        });
-    }
 }