Rewrite VIP tools to not mutate context

src/window/vip/bgmap.rs

@@ -8,10 +8,10 @@ use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 
 use crate::{
     emulator::SimId,
-    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
+    images::{ImageBuffer, ImageParams, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        AppWindow, InitArgs,
+        AppWindow,
         utils::{NumberEdit, UiExt},
     },
 };
@@ -20,7 +20,6 @@ use super::utils::{self, CellData, CharacterGrid};
 
 pub struct BgMapWindow {
     sim_id: SimId,
-    loader: Arc<ImageTextureLoader>,
     memory: Arc<MemoryClient>,
     bgmaps: MemoryView,
     cell_index: usize,
@@ -31,14 +30,11 @@ pub struct BgMapWindow {
 }
 
 impl BgMapWindow {
-    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
+    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &ImageTextureLoader) -> Self {
         let renderer = BgMapRenderer::new(sim_id, memory);
-        let ([cell, bgmap], params) = images.add(renderer, BgMapParams::default());
-        let loader =
-            ImageTextureLoader::new([("vip://cell".into(), cell), ("vip://bgmap".into(), bgmap)]);
+        let params = images.add(sim_id, renderer, BgMapParams::default());
         Self {
             sim_id,
-            loader: Arc::new(loader),
             memory: memory.clone(),
             bgmaps: memory.watch(sim_id, 0x00020000, 0x20000),
             cell_index: params.cell_index,
@@ -90,7 +86,7 @@ impl BgMapWindow {
                         });
                     });
                 });
-            let image = Image::new("vip://cell")
+            let image = Image::new(self.image_url("bgmap-cell"))
                 .maintain_aspect_ratio(true)
                 .texture_options(TextureOptions::NEAREST);
             ui.add(image);
@@ -162,7 +158,7 @@ impl BgMapWindow {
     }
 
     fn show_bgmap(&mut self, ui: &mut Ui) {
-        let grid = CharacterGrid::new("vip://bgmap")
+        let grid = CharacterGrid::new(self.image_url("bgmap"))
             .with_scale(self.scale)
             .with_grid(self.show_grid)
             .with_selected(self.cell_index % 4096);
@@ -187,10 +183,6 @@ impl AppWindow for BgMapWindow {
             .with_inner_size((640.0, 480.0))
     }
 
-    fn on_init(&mut self, args: InitArgs) {
-        args.ctx.add_texture_loader(self.loader.clone());
-    }
-
     fn show(&mut self, ui: &mut Ui) {
         CentralPanel::default().show_inside(ui, |ui| {
             ui.horizontal_top(|ui| {
@@ -300,6 +292,10 @@ impl BgMapRenderer {
 impl ImageRenderer<2> for BgMapRenderer {
     type Params = BgMapParams;
 
+    fn names(&self) -> [&str; 2] {
+        ["bgmap-cell", "bgmap"]
+    }
+
     fn sizes(&self) -> [[usize; 2]; 2] {
         [[8, 8], [8 * 64, 8 * 64]]
     }