Rewrite VIP tools to not mutate context

src/window/vip/framebuffer.rs

@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
 use egui::{
     Align, CentralPanel, Color32, Image, ScrollArea, Slider, TextEdit, TextureOptions, Ui,
     ViewportBuilder, ViewportId,
@@ -8,10 +6,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 as _},
     },
 };
@@ -20,7 +18,6 @@ use super::utils;
 
 pub struct FrameBufferWindow {
     sim_id: SimId,
-    loader: Arc<ImageTextureLoader>,
     index: usize,
     left: bool,
     right: bool,
@@ -30,7 +27,7 @@ pub struct FrameBufferWindow {
 }
 
 impl FrameBufferWindow {
-    pub fn new(sim_id: SimId, memory: &MemoryClient, images: &mut ImageProcessor) -> Self {
+    pub fn new(sim_id: SimId, memory: &MemoryClient, images: &ImageTextureLoader) -> Self {
         let initial_params = FrameBufferParams {
             index: 0,
             left: true,
@@ -40,11 +37,9 @@ impl FrameBufferWindow {
             right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
         };
         let renderer = FrameBufferRenderer::new(sim_id, memory);
-        let ([buffer], params) = images.add(renderer, initial_params);
-        let loader = ImageTextureLoader::new([("vip://buffer".into(), buffer)]);
+        let params = images.add(sim_id, renderer, initial_params);
         Self {
             sim_id,
-            loader: Arc::new(loader),
             index: params.index,
             left: params.left,
             right: params.right,
@@ -131,7 +126,7 @@ impl FrameBufferWindow {
     }
 
     fn show_buffers(&mut self, ui: &mut Ui) {
-        let image = Image::new("vip://buffer")
+        let image = Image::new(self.image_url("buffer"))
             .fit_to_original_size(self.scale)
             .texture_options(TextureOptions::NEAREST);
         ui.add(image);
@@ -153,10 +148,6 @@ impl AppWindow for FrameBufferWindow {
             .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| {
@@ -208,6 +199,10 @@ impl FrameBufferRenderer {
 impl ImageRenderer<1> for FrameBufferRenderer {
     type Params = FrameBufferParams;
 
+    fn names(&self) -> [&str; 1] {
+        ["buffer"]
+    }
+
     fn sizes(&self) -> [[usize; 2]; 1] {
         [[384, 224]]
     }