Skip to content

Commit

Permalink
Replace custom map implementation with walkers crate
Browse files Browse the repository at this point in the history
Also, add downsampling to path drawing. Still requires upstream merges.
  • Loading branch information
KoffeinFlummi committed Nov 25, 2023
1 parent f113985 commit 0faf5a9
Show file tree
Hide file tree
Showing 5 changed files with 325 additions and 389 deletions.
183 changes: 170 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ egui_plot = "0.23"
egui_extras = { version = "0.23", features = ["image"] }
image = { version = "0.24", features = ["png"] }
egui-gizmo = "0.12"
walkers = { path = "../walkers/walkers" }
# serialization & communication
serde = { version = "1", features = ["derive"] }
serde_json = "1.0.89"
Expand All @@ -31,7 +32,6 @@ crc = "2"
nalgebra = "0.31"
chrono = "0.4"
directories = "4.0"
slippy-map-tiles = "0.16"
colorgrad = "0.6"
rand_distr = { version = "0.4", default-features = false }
tokio = "1.33"
Expand Down
3 changes: 1 addition & 2 deletions src/gui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl Sam {

ctx.set_fonts(fonts);

let plot_tab = PlotTab::init(&settings);
let plot_tab = PlotTab::init(ctx, &settings);
let configure_tab = ConfigureTab::init();

egui_extras::install_image_loaders(ctx);
Expand Down Expand Up @@ -187,7 +187,6 @@ impl Sam {
let changed = self.configure_tab.main_ui(ui, self.data_source.as_mut(), &mut self.settings);
if changed {
self.data_source.apply_settings(&self.settings);
self.plot_tab.apply_settings(&self.settings);
}
}
}
Expand Down
Loading

0 comments on commit 0faf5a9

Please sign in to comment.