View normal worlds

Cargo.toml

@@ -4,8 +4,8 @@ description = "An emulator for the Virtual Boy."
 repository = "https://git.virtual-boy.com/PVB/lemur"
 publish = false
 license = "MIT"
-version = "0.4.7"
+version = "0.3.2"
-edition = "2024"
+edition = "2021"
 
 [dependencies]
 anyhow = "1"
@@ -15,22 +15,21 @@ bitflags = { version = "2", features = ["serde"] }
 bytemuck = { version = "1", features = ["derive"] }
 clap = { version = "4", features = ["derive"] }
 cpal = { git = "https://github.com/sidit77/cpal.git", rev = "66ed6be" }
-directories = "6"
+directories = "5"
 egui = { version = "0.30", features = ["serde"] }
 egui_extras = { version = "0.30", features = ["image"] }
 egui-toast = { git = "https://github.com/urholaukkarinen/egui-toast.git", rev = "d0bcf97" }
 egui-winit = "0.30"
 egui-wgpu = { version = "0.30", features = ["winit"] }
-fixed = { version = "1.28", features = ["num-traits"] }
 gilrs = { version = "0.11", features = ["serde-serialize"] }
 hex = "0.4"
 image = { version = "0.25", default-features = false, features = ["png"] }
-itertools = "0.14"
+itertools = "0.13"
 num-derive = "0.4"
 num-traits = "0.2"
 oneshot = "0.1"
 pollster = "0.4"
-rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "async-std"]}
+rfd = "0.15"
 rtrb = "0.3"
 rubato = "0.16"
 serde = { version = "1", features = ["derive"] }
@@ -43,7 +42,7 @@ wgpu = "23"
 winit = { version = "0.30", features = ["serde"] }
 
 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.59", features = ["Win32_System_Threading"] }
+windows = { version = "0.58", features = ["Win32_System_Threading"] }
 
 [build-dependencies]
 cc = "1"

README.md

@@ -6,8 +6,6 @@ A Virtual Boy emulator built around the shrooms-vb core. Written in Rust, using
 
 Install the following dependencies:
  - `cargo` (via [rustup](https://rustup.rs/), the version from your package manager is too old)
- - a C compiler (any will do, [the build script](https://docs.rs/cc/latest/cc/#compile-time-requirements) will find it automatically)
- - (on linux) `libasound2-dev` and `libudev-dev`
 
 Run
 ```sh

src/app.rs

@@ -1,10 +1,9 @@
 use std::{collections::HashSet, num::NonZero, sync::Arc, thread, time::Duration};
 
 use egui::{
+    ahash::{HashMap, HashMapExt},
     Context, FontData, FontDefinitions, FontFamily, IconData, TextWrapMode, ViewportBuilder,
     ViewportCommand, ViewportId, ViewportInfo,
-    ahash::{HashMap, HashMapExt},
-    style::ScrollStyle,
 };
 use gilrs::{EventType, Gilrs};
 use tracing::{error, warn};
@@ -18,13 +17,13 @@ use winit::{
 use crate::{
     controller::ControllerManager,
     emulator::{EmulatorClient, EmulatorCommand, SimId},
-    images::ImageProcessor,
+    input::MappingProvider,
-    input::{MappingProvider, ShortcutProvider},
     memory::MemoryClient,
     persistence::Persistence,
+    vram::VramProcessor,
     window::{
-        AboutWindow, AppWindow, BgMapWindow, CharacterDataWindow, FrameBufferWindow, GameWindow,
+        AboutWindow, AppWindow, BgMapWindow, CharacterDataWindow, GameWindow, GdbServerWindow,
-        GdbServerWindow, InputWindow, ObjectWindow, RegisterWindow, ShortcutsWindow, WorldWindow,
+        InputWindow, ObjectWindow, WorldWindow,
     },
 };
 
@@ -45,10 +44,9 @@ pub struct Application {
     client: EmulatorClient,
     proxy: EventLoopProxy<UserEvent>,
     mappings: MappingProvider,
-    shortcuts: ShortcutProvider,
     controllers: ControllerManager,
     memory: Arc<MemoryClient>,
-    images: ImageProcessor,
+    vram: VramProcessor,
     persistence: Persistence,
     viewports: HashMap<ViewportId, Viewport>,
     focused: Option<ViewportId>,
@@ -65,10 +63,9 @@ impl Application {
         let icon = load_icon().ok().map(Arc::new);
         let persistence = Persistence::new();
         let mappings = MappingProvider::new(persistence.clone());
-        let shortcuts = ShortcutProvider::new(persistence.clone());
         let controllers = ControllerManager::new(client.clone(), &mappings);
         let memory = Arc::new(MemoryClient::new(client.clone()));
-        let images = ImageProcessor::new();
+        let vram = VramProcessor::new();
         {
             let mappings = mappings.clone();
             let proxy = proxy.clone();
@@ -80,9 +77,8 @@ impl Application {
             client,
             proxy,
             mappings,
-            shortcuts,
             memory,
-            images,
+            vram,
             controllers,
             persistence,
             viewports: HashMap::new(),
@@ -93,8 +89,7 @@ impl Application {
 
     fn open(&mut self, event_loop: &ActiveEventLoop, window: Box<dyn AppWindow>) {
         let viewport_id = window.viewport_id();
-        if let Some(viewport) = self.viewports.get(&viewport_id) {
+        if self.viewports.contains_key(&viewport_id) {
-            viewport.window.focus_window();
             return;
         }
         self.viewports.insert(
@@ -116,7 +111,6 @@ impl ApplicationHandler<UserEvent> for Application {
             self.client.clone(),
             self.proxy.clone(),
             self.persistence.clone(),
-            self.shortcuts.clone(),
             SimId::Player1,
         );
         self.open(event_loop, Box::new(app));
@@ -220,29 +214,21 @@ impl ApplicationHandler<UserEvent> for Application {
                 self.open(event_loop, Box::new(about));
             }
             UserEvent::OpenCharacterData(sim_id) => {
-                let chardata = CharacterDataWindow::new(sim_id, &self.memory, &mut self.images);
+                let vram = CharacterDataWindow::new(sim_id, &self.memory, &mut self.vram);
-                self.open(event_loop, Box::new(chardata));
+                self.open(event_loop, Box::new(vram));
             }
             UserEvent::OpenBgMap(sim_id) => {
-                let bgmap = BgMapWindow::new(sim_id, &self.memory, &mut self.images);
+                let bgmap = BgMapWindow::new(sim_id, &self.memory, &mut self.vram);
                 self.open(event_loop, Box::new(bgmap));
             }
             UserEvent::OpenObjects(sim_id) => {
-                let objects = ObjectWindow::new(sim_id, &self.memory, &mut self.images);
+                let objects = ObjectWindow::new(sim_id, &self.memory, &mut self.vram);
                 self.open(event_loop, Box::new(objects));
             }
             UserEvent::OpenWorlds(sim_id) => {
-                let world = WorldWindow::new(sim_id, &self.memory, &mut self.images);
+                let world = WorldWindow::new(sim_id, &self.memory, &mut self.vram);
                 self.open(event_loop, Box::new(world));
             }
-            UserEvent::OpenFrameBuffers(sim_id) => {
-                let world = FrameBufferWindow::new(sim_id, &self.memory, &mut self.images);
-                self.open(event_loop, Box::new(world));
-            }
-            UserEvent::OpenRegisters(sim_id) => {
-                let registers = RegisterWindow::new(sim_id, &self.memory);
-                self.open(event_loop, Box::new(registers));
-            }
             UserEvent::OpenDebugger(sim_id) => {
                 let debugger =
                     GdbServerWindow::new(sim_id, self.client.clone(), self.proxy.clone());
@@ -252,16 +238,11 @@ impl ApplicationHandler<UserEvent> for Application {
                 let input = InputWindow::new(self.mappings.clone());
                 self.open(event_loop, Box::new(input));
             }
-            UserEvent::OpenShortcuts => {
-                let shortcuts = ShortcutsWindow::new(self.shortcuts.clone());
-                self.open(event_loop, Box::new(shortcuts));
-            }
             UserEvent::OpenPlayer2 => {
                 let p2 = GameWindow::new(
                     self.client.clone(),
                     self.proxy.clone(),
                     self.persistence.clone(),
-                    self.shortcuts.clone(),
                     SimId::Player2,
                 );
                 self.open(event_loop, Box::new(p2));
@@ -378,7 +359,6 @@ impl Viewport {
         ctx.style_mut(|s| {
             s.wrap_mode = Some(TextWrapMode::Extend);
             s.visuals.menu_rounding = Default::default();
-            s.spacing.scroll = ScrollStyle::thin();
         });
         egui_extras::install_image_loaders(&ctx);
 
@@ -511,11 +491,8 @@ pub enum UserEvent {
     OpenBgMap(SimId),
     OpenObjects(SimId),
     OpenWorlds(SimId),
-    OpenFrameBuffers(SimId),
-    OpenRegisters(SimId),
     OpenDebugger(SimId),
     OpenInput,
-    OpenShortcuts,
     OpenPlayer2,
     Quit(SimId),
 }

src/audio.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use anyhow::{Result, bail};
+use anyhow::{bail, Result};
 use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
 use itertools::Itertools;
 use rubato::{FftFixedInOut, Resampler};

src/controller.rs

@@ -1,6 +1,6 @@
 use std::sync::{Arc, RwLock};
 
-use gilrs::{Event as GamepadEvent, EventType, GamepadId, ev::Code};
+use gilrs::{ev::Code, Event as GamepadEvent, EventType, GamepadId};
 use winit::{
     event::{ElementState, KeyEvent},
     keyboard::PhysicalKey,

src/emulator.rs

@@ -5,9 +5,9 @@ use std::{
     io::{Read, Seek, SeekFrom, Write},
     path::{Path, PathBuf},
     sync::{
-        Arc, Weak,
         atomic::{AtomicBool, Ordering},
         mpsc::{self, RecvError, TryRecvError},
+        Arc, Weak,
     },
 };
 
@@ -22,7 +22,7 @@ use crate::{
     graphics::TextureSink,
     memory::{MemoryRange, MemoryRegion},
 };
-use shrooms_vb_core::{EXPECTED_FRAME_SIZE, Sim, StopReason};
+use shrooms_vb_core::{Sim, StopReason, EXPECTED_FRAME_SIZE};
 pub use shrooms_vb_core::{VBKey, VBRegister, VBWatchpointType};
 
 mod address_set;
@@ -291,26 +291,6 @@ impl Emulator {
         );
     }
 
-    fn frame_advance(&mut self) {
-        if self
-            .state
-            .compare_exchange(
-                EmulatorState::Paused,
-                EmulatorState::Stepping,
-                Ordering::AcqRel,
-                Ordering::Acquire,
-            )
-            .is_err_and(|s| s == EmulatorState::Running)
-        {
-            let _ = self.state.compare_exchange(
-                EmulatorState::Running,
-                EmulatorState::Stepping,
-                Ordering::AcqRel,
-                Ordering::Relaxed,
-            );
-        }
-    }
-
     fn save_sram(&mut self, sim_id: SimId) -> Result<()> {
         let sim = self.sims.get_mut(sim_id.to_index());
         let cart = self.carts[sim_id.to_index()].as_mut();
@@ -386,7 +366,6 @@ impl Emulator {
         debugger.stop_reason = None;
         true
     }
-
     fn debug_step(&mut self, sim_id: SimId) {
         if self.debug_continue(sim_id) {
             let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
@@ -449,7 +428,7 @@ impl Emulator {
         // Don't emulate if the state is "paused", or if any sim is paused in the debugger
         let running = match state {
             EmulatorState::Paused => false,
-            EmulatorState::Running | EmulatorState::Stepping => true,
+            EmulatorState::Running => true,
             EmulatorState::Debugging => self.debuggers.values().all(|d| d.stop_reason.is_none()),
         };
         let p1_running = running && p1_state == SimState::Ready;
@@ -463,10 +442,6 @@ impl Emulator {
             self.sims[SimId::Player2.to_index()].emulate();
         }
 
-        if state == EmulatorState::Stepping {
-            self.state.store(EmulatorState::Paused, Ordering::Release);
-        }
-
         // Debug state
         if state == EmulatorState::Debugging {
             for sim_id in SimId::values() {
@@ -564,9 +539,6 @@ impl Emulator {
             EmulatorCommand::Resume => {
                 self.resume_sims();
             }
-            EmulatorCommand::FrameAdvance => {
-                self.frame_advance();
-            }
             EmulatorCommand::StartDebugging(sim_id, debugger) => {
                 self.start_debugging(sim_id, debugger);
             }
@@ -693,7 +665,6 @@ pub enum EmulatorCommand {
     StopSecondSim,
     Pause,
     Resume,
-    FrameAdvance,
     StartDebugging(SimId, DebugSender),
     StopDebugging(SimId),
     DebugInterrupt(SimId),
@@ -729,7 +700,6 @@ pub enum SimState {
 pub enum EmulatorState {
     Paused,
     Running,
-    Stepping,
     Debugging,
 }
 

src/emulator/shrooms_vb_core.rs

@@ -1,6 +1,6 @@
 use std::{ffi::c_void, ptr, slice};
 
-use anyhow::{Result, anyhow};
+use anyhow::{anyhow, Result};
 use bitflags::bitflags;
 use num_derive::{FromPrimitive, ToPrimitive};
 use serde::{Deserialize, Serialize};
@@ -91,7 +91,7 @@ type OnWrite = extern "C" fn(
 ) -> c_int;
 
 #[link(name = "vb")]
-unsafe extern "C" {
+extern "C" {
     #[link_name = "vbEmulate"]
     fn vb_emulate(sim: *mut VB, cycles: *mut u32) -> c_int;
     #[link_name = "vbEmulateEx"]
@@ -170,7 +170,7 @@ unsafe extern "C" {
     fn vb_write(sim: *mut VB, address: u32, _type: VBDataType, value: i32) -> i32;
 }
 
-#[unsafe(no_mangle)]
+#[no_mangle]
 extern "C" fn on_frame(sim: *mut VB) -> c_int {
     // SAFETY: the *mut VB owns its userdata.
     // There is no way for the userdata to be null or otherwise invalid.
@@ -179,7 +179,7 @@ extern "C" fn on_frame(sim: *mut VB) -> c_int {
     1
 }
 
-#[unsafe(no_mangle)]
+#[no_mangle]
 extern "C" fn on_execute(sim: *mut VB, address: u32, _code: *const u16, _length: c_int) -> c_int {
     // SAFETY: the *mut VB owns its userdata.
     // There is no way for the userdata to be null or otherwise invalid.
@@ -196,10 +196,14 @@ extern "C" fn on_execute(sim: *mut VB, address: u32, _code: *const u16, _length:
         stopped = true;
     }
 
-    if stopped { 1 } else { 0 }
+    if stopped {
+        1
+    } else {
+        0
+    }
 }
 
-#[unsafe(no_mangle)]
+#[no_mangle]
 extern "C" fn on_read(
     sim: *mut VB,
     address: u32,
@@ -225,7 +229,7 @@ extern "C" fn on_read(
     0
 }
 
-#[unsafe(no_mangle)]
+#[no_mangle]
 extern "C" fn on_write(
     sim: *mut VB,
     address: u32,

src/gdbserver.rs

@@ -1,4 +1,4 @@
-use anyhow::{Result, bail};
+use anyhow::{bail, Result};
 use registers::REGISTERS;
 use request::{Request, RequestKind, RequestSource};
 use response::Response;
@@ -12,7 +12,7 @@ use tokio::{
     pin, select,
     sync::{mpsc, oneshot},
 };
-use tracing::{Level, debug, enabled, error, info};
+use tracing::{debug, enabled, error, info, Level};
 
 use crate::emulator::{
     DebugEvent, DebugStopReason, EmulatorClient, EmulatorCommand, SimId, VBWatchpointType,

src/gdbserver/request.rs

@@ -1,4 +1,4 @@
-use anyhow::{Result, bail};
+use anyhow::{bail, Result};
 use atoi::FromRadix16;
 use tokio::io::{AsyncRead, AsyncReadExt as _};
 

src/graphics.rs

@@ -1,13 +1,12 @@
 use std::{
     sync::{
-        Arc, Mutex, MutexGuard,
         atomic::{AtomicU64, Ordering},
-        mpsc,
+        mpsc, Arc, Mutex, MutexGuard,
     },
     thread,
 };
 
-use anyhow::{Result, bail};
+use anyhow::{bail, Result};
 use itertools::Itertools as _;
 use wgpu::{
     Device, Extent3d, ImageCopyTexture, ImageDataLayout, Origin3d, Queue, Texture,
@@ -65,7 +64,9 @@ impl TextureSink {
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
             format: TextureFormat::Rg8Unorm,
-            usage: TextureUsages::COPY_DST | TextureUsages::TEXTURE_BINDING,
+            usage: TextureUsages::COPY_SRC
+                | TextureUsages::COPY_DST
+                | TextureUsages::TEXTURE_BINDING,
             view_formats: &[TextureFormat::Rg8Unorm],
         };
         device.create_texture(&desc)

src/input.rs

@@ -1,14 +1,12 @@
 use std::{
-    cmp::Ordering,
+    collections::{hash_map::Entry, HashMap},
-    collections::{HashMap, HashSet, hash_map::Entry},
     fmt::Display,
     str::FromStr,
-    sync::{Arc, Mutex, RwLock},
+    sync::{Arc, RwLock},
 };
 
 use anyhow::anyhow;
-use egui::{Key, KeyboardShortcut, Modifiers};
+use gilrs::{ev::Code, Axis, Button, Gamepad, GamepadId};
-use gilrs::{Axis, Button, Gamepad, GamepadId, ev::Code};
 use serde::{Deserialize, Serialize};
 use winit::keyboard::{KeyCode, PhysicalKey};
 
@@ -456,205 +454,3 @@ struct PersistedGamepadMapping {
     default_buttons: Vec<(Code, VBKey)>,
     default_axes: Vec<(Code, (VBKey, VBKey))>,
 }
-
-#[derive(Serialize, Deserialize)]
-pub struct Shortcut {
-    pub shortcut: KeyboardShortcut,
-    pub command: Command,
-}
-
-#[derive(Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Hash)]
-pub enum Command {
-    OpenRom,
-    Quit,
-    FrameAdvance,
-    Reset,
-    PauseResume,
-    // if you update this, update Command::all and add a default
-}
-
-impl Command {
-    pub fn all() -> [Self; 5] {
-        [
-            Self::OpenRom,
-            Self::Quit,
-            Self::PauseResume,
-            Self::Reset,
-            Self::FrameAdvance,
-        ]
-    }
-
-    pub fn name(self) -> &'static str {
-        match self {
-            Self::OpenRom => "Open ROM",
-            Self::Quit => "Exit",
-            Self::PauseResume => "Pause/Resume",
-            Self::Reset => "Reset",
-            Self::FrameAdvance => "Frame Advance",
-        }
-    }
-}
-
-impl Display for Command {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(self.name())
-    }
-}
-
-struct Shortcuts {
-    all: Vec<(Command, KeyboardShortcut)>,
-    by_command: HashMap<Command, KeyboardShortcut>,
-}
-
-impl Default for Shortcuts {
-    fn default() -> Self {
-        let mut shortcuts = Shortcuts {
-            all: vec![],
-            by_command: HashMap::new(),
-        };
-        shortcuts.set(
-            Command::OpenRom,
-            KeyboardShortcut::new(Modifiers::COMMAND, Key::O),
-        );
-        shortcuts.set(
-            Command::Quit,
-            KeyboardShortcut::new(Modifiers::COMMAND, Key::Q),
-        );
-        shortcuts.set(
-            Command::PauseResume,
-            KeyboardShortcut::new(Modifiers::NONE, Key::F5),
-        );
-        shortcuts.set(
-            Command::Reset,
-            KeyboardShortcut::new(Modifiers::SHIFT, Key::F5),
-        );
-        shortcuts.set(
-            Command::FrameAdvance,
-            KeyboardShortcut::new(Modifiers::NONE, Key::F6),
-        );
-        shortcuts
-    }
-}
-
-impl Shortcuts {
-    fn set(&mut self, command: Command, shortcut: KeyboardShortcut) {
-        if self.by_command.insert(command, shortcut).is_some() {
-            for (cmd, sht) in &mut self.all {
-                if *cmd == command {
-                    *sht = shortcut;
-                    break;
-                }
-            }
-        } else {
-            self.all.push((command, shortcut));
-        }
-        self.all.sort_by(|l, r| order_shortcut(l.1, r.1));
-    }
-
-    fn unset(&mut self, command: Command) {
-        if self.by_command.remove(&command).is_some() {
-            self.all.retain(|(c, _)| *c != command);
-        }
-    }
-
-    fn save(&self) -> PersistedShortcuts {
-        let mut shortcuts = PersistedShortcuts { shortcuts: vec![] };
-        for command in Command::all() {
-            let shortcut = self.by_command.get(&command).copied();
-            shortcuts.shortcuts.push((command, shortcut));
-        }
-        shortcuts
-    }
-}
-
-fn order_shortcut(left: KeyboardShortcut, right: KeyboardShortcut) -> Ordering {
-    left.logical_key.cmp(&right.logical_key).then_with(|| {
-        specificity(left.modifiers)
-            .cmp(&specificity(right.modifiers))
-            .reverse()
-    })
-}
-
-fn specificity(modifiers: egui::Modifiers) -> usize {
-    let mut mods = 0;
-    if modifiers.alt {
-        mods += 1;
-    }
-    if modifiers.command || modifiers.ctrl {
-        mods += 1;
-    }
-    if modifiers.shift {
-        mods += 1;
-    }
-    mods
-}
-
-#[derive(Serialize, Deserialize)]
-struct PersistedShortcuts {
-    shortcuts: Vec<(Command, Option<KeyboardShortcut>)>,
-}
-
-#[derive(Clone)]
-pub struct ShortcutProvider {
-    persistence: Persistence,
-    shortcuts: Arc<Mutex<Shortcuts>>,
-}
-
-impl ShortcutProvider {
-    pub fn new(persistence: Persistence) -> Self {
-        let mut shortcuts = Shortcuts::default();
-        if let Ok(saved) = persistence.load_config::<PersistedShortcuts>("shortcuts") {
-            for (command, shortcut) in saved.shortcuts {
-                if let Some(shortcut) = shortcut {
-                    shortcuts.set(command, shortcut);
-                } else {
-                    shortcuts.unset(command);
-                }
-            }
-        }
-        Self {
-            persistence,
-            shortcuts: Arc::new(Mutex::new(shortcuts)),
-        }
-    }
-
-    pub fn shortcut_for(&self, command: Command) -> Option<KeyboardShortcut> {
-        let lock = self.shortcuts.lock().unwrap();
-        lock.by_command.get(&command).copied()
-    }
-
-    pub fn consume_all(&self, input: &mut egui::InputState) -> HashSet<Command> {
-        let lock = self.shortcuts.lock().unwrap();
-        lock.all
-            .iter()
-            .filter_map(|(command, shortcut)| input.consume_shortcut(shortcut).then_some(*command))
-            .collect()
-    }
-
-    pub fn set(&self, command: Command, shortcut: KeyboardShortcut) {
-        let updated = {
-            let mut lock = self.shortcuts.lock().unwrap();
-            lock.set(command, shortcut);
-            lock.save()
-        };
-        let _ = self.persistence.save_config("shortcuts", &updated);
-    }
-
-    pub fn unset(&self, command: Command) {
-        let updated = {
-            let mut lock = self.shortcuts.lock().unwrap();
-            lock.unset(command);
-            lock.save()
-        };
-        let _ = self.persistence.save_config("shortcuts", &updated);
-    }
-
-    pub fn reset(&self) {
-        let updated = {
-            let mut lock = self.shortcuts.lock().unwrap();
-            *lock = Shortcuts::default();
-            lock.save()
-        };
-        let _ = self.persistence.save_config("shortcuts", &updated);
-    }
-}

src/main.rs

@@ -3,13 +3,13 @@
 
 use std::{path::PathBuf, process, time::SystemTime};
 
-use anyhow::{Result, bail};
+use anyhow::{bail, Result};
 use app::Application;
 use clap::Parser;
 use emulator::EmulatorBuilder;
 use thread_priority::{ThreadBuilder, ThreadPriority};
 use tracing::error;
-use tracing_subscriber::{EnvFilter, Layer, layer::SubscriberExt, util::SubscriberInitExt};
+use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer};
 use winit::event_loop::{ControlFlow, EventLoop};
 
 mod app;
@@ -18,10 +18,10 @@ mod controller;
 mod emulator;
 mod gdbserver;
 mod graphics;
-mod images;
 mod input;
 mod memory;
 mod persistence;
+mod vram;
 mod window;
 
 #[derive(Parser)]

src/memory.rs

@@ -2,7 +2,7 @@ use std::{
     collections::HashMap,
     fmt::Debug,
     iter::FusedIterator,
-    sync::{Arc, Mutex, RwLock, RwLockReadGuard, TryLockError, Weak, atomic::AtomicU64},
+    sync::{atomic::AtomicU64, Arc, Mutex, RwLock, RwLockReadGuard, TryLockError, Weak},
 };
 
 use bytemuck::BoxBytes;
@@ -98,11 +98,8 @@ macro_rules! primitive_memory_value_impl {
 }
 
 primitive_memory_value_impl!(u8, 1);
-primitive_memory_value_impl!(i8, 1);
 primitive_memory_value_impl!(u16, 2);
-primitive_memory_value_impl!(i16, 2);
 primitive_memory_value_impl!(u32, 4);
-primitive_memory_value_impl!(i32, 4);
 
 impl<const N: usize, T: MemoryValue> MemoryValue for [T; N] {
     #[inline]
@@ -223,7 +220,7 @@ impl MemoryRegion {
                 .iter()
                 .map(|i| i.load(std::sync::atomic::Ordering::Acquire))
                 .enumerate()
-                .max_by_key(|(_, g)| *g)
+                .max_by_key(|(_, gen)| *gen)
                 .map(|(i, _)| i)
                 .unwrap();
             let inner = match self.bufs[newest_index].try_read() {
@@ -238,10 +235,11 @@ impl MemoryRegion {
     }
 
     pub fn update(&self, data: &[u8]) {
-        let gens = self
+        let gens: Vec<u64> = self
             .gens
-            .each_ref()
+            .iter()
-            .map(|i| i.load(std::sync::atomic::Ordering::Acquire));
+            .map(|i| i.load(std::sync::atomic::Ordering::Acquire))
+            .collect();
         let next_gen = gens.iter().max().unwrap() + 1;
         let indices = gens
             .into_iter()
@@ -263,7 +261,7 @@ impl MemoryRegion {
         /*
          * We have four buffers, and (at time of writing) only three threads interacting with memory:
          * - The UI thread, reading small regions of memory
-         * - The "image renderer" thread, reading large regions of memory
+         * - The "vram renderer" thread, reading large regions of memory
          * - The emulation thread, writing memory every so often
          * So it should be impossible for all four buffers to have a read lock at the same time,
          *  and (because readers always read the newest buffer) at least one of the oldest three

src/persistence.rs

@@ -1,6 +1,6 @@
 use std::{fs, path::PathBuf};
 
-use anyhow::{Result, bail};
+use anyhow::{bail, Result};
 use directories::ProjectDirs;
 use serde::{Deserialize, Serialize};
 

src/vram.rs

@@ -7,17 +7,17 @@ use std::{
 };
 
 use egui::{
-    Color32, ColorImage, TextureHandle, TextureOptions,
     epaint::ImageDelta,
     load::{LoadError, SizedTexture, TextureLoader, TexturePoll},
+    Color32, ColorImage, TextureHandle, TextureOptions,
 };
 use tokio::{sync::mpsc, time::timeout};
 
-pub struct ImageProcessor {
+pub struct VramProcessor {
-    sender: mpsc::UnboundedSender<Box<dyn ImageRendererImpl>>,
+    sender: mpsc::UnboundedSender<Box<dyn VramRendererImpl>>,
 }
 
-impl ImageProcessor {
+impl VramProcessor {
     pub fn new() -> Self {
         let (sender, receiver) = mpsc::unbounded_channel();
         thread::spawn(move || {
@@ -26,7 +26,7 @@ impl ImageProcessor {
                 .build()
                 .unwrap()
                 .block_on(async move {
-                    let mut worker = ImageProcessorWorker {
+                    let mut worker = VramProcessorWorker {
                         receiver,
                         renderers: vec![],
                     };
@@ -36,27 +36,27 @@ impl ImageProcessor {
         Self { sender }
     }
 
-    pub fn add<const N: usize, R: ImageRenderer<N> + 'static>(
+    pub fn add<const N: usize, R: VramRenderer<N> + 'static>(
         &self,
         renderer: R,
         params: R::Params,
-    ) -> ([ImageHandle; N], ImageParams<R::Params>) {
+    ) -> ([VramImageHandle; N], VramParams<R::Params>) {
-        let states = renderer.sizes().map(ImageState::new);
+        let states = renderer.sizes().map(VramRenderImageState::new);
-        let handles = states.clone().map(|state| ImageHandle {
+        let handles = states.clone().map(|state| VramImageHandle {
             size: state.size.map(|i| i as f32),
             data: state.sink,
         });
         let images = renderer
             .sizes()
-            .map(|[width, height]| ImageBuffer::new(width, height));
+            .map(|[width, height]| VramImage::new(width, height));
         let sink = Arc::new(Mutex::new(params.clone()));
-        let _ = self.sender.send(Box::new(ImageRendererWrapper {
+        let _ = self.sender.send(Box::new(VramRendererWrapper {
             renderer,
             params: Arc::downgrade(&sink),
             images,
             states,
         }));
-        let params = ImageParams {
+        let params = VramParams {
             value: params,
             sink,
         };
@@ -64,12 +64,12 @@ impl ImageProcessor {
     }
 }
 
-struct ImageProcessorWorker {
+struct VramProcessorWorker {
-    receiver: mpsc::UnboundedReceiver<Box<dyn ImageRendererImpl>>,
+    receiver: mpsc::UnboundedReceiver<Box<dyn VramRendererImpl>>,
-    renderers: Vec<Box<dyn ImageRendererImpl>>,
+    renderers: Vec<Box<dyn VramRendererImpl>>,
 }
 
-impl ImageProcessorWorker {
+impl VramProcessorWorker {
     async fn run(&mut self) {
         loop {
             if self.renderers.is_empty() {
@@ -100,12 +100,12 @@ impl ImageProcessorWorker {
     }
 }
 
-pub struct ImageBuffer {
+pub struct VramImage {
     pub size: [usize; 2],
     pub pixels: Vec<Color32>,
 }
 
-impl ImageBuffer {
+impl VramImage {
     pub fn new(width: usize, height: usize) -> Self {
         Self {
             size: [width, height],
@@ -143,23 +143,23 @@ impl ImageBuffer {
 }
 
 #[derive(Clone)]
-pub struct ImageHandle {
+pub struct VramImageHandle {
     size: [f32; 2],
     data: Arc<Mutex<Option<Arc<ColorImage>>>>,
 }
 
-impl ImageHandle {
+impl VramImageHandle {
     fn pull(&mut self) -> Option<Arc<ColorImage>> {
         self.data.lock().unwrap().take()
     }
 }
 
-pub struct ImageParams<T> {
+pub struct VramParams<T> {
     value: T,
     sink: Arc<Mutex<T>>,
 }
 
-impl<T> Deref for ImageParams<T> {
+impl<T> Deref for VramParams<T> {
     type Target = T;
 
     fn deref(&self) -> &Self::Target {
@@ -167,7 +167,7 @@ impl<T> Deref for ImageParams<T> {
     }
 }
 
-impl<T: Clone + Eq> ImageParams<T> {
+impl<T: Clone + Eq> VramParams<T> {
     pub fn write(&mut self, value: T) {
         if self.value != value {
             self.value = value.clone();
@@ -176,21 +176,21 @@ impl<T: Clone + Eq> ImageParams<T> {
     }
 }
 
-pub trait ImageRenderer<const N: usize>: Send {
+pub trait VramRenderer<const N: usize>: Send {
     type Params: Clone + Send;
     fn sizes(&self) -> [[usize; 2]; N];
-    fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; N]);
+    fn render(&mut self, params: &Self::Params, images: &mut [VramImage; N]);
 }
 
 #[derive(Clone)]
-struct ImageState {
+struct VramRenderImageState {
     size: [usize; 2],
     buffers: [Arc<ColorImage>; 2],
     last_buffer: usize,
     sink: Arc<Mutex<Option<Arc<ColorImage>>>>,
 }
 
-impl ImageState {
+impl VramRenderImageState {
     fn new(size: [usize; 2]) -> Self {
         let buffers = [
             Arc::new(ColorImage::new(size, Color32::BLACK)),
@@ -204,7 +204,7 @@ impl ImageState {
             sink: Arc::new(Mutex::new(Some(sink))),
         }
     }
-    fn try_send_update(&mut self, image: &ImageBuffer) {
+    fn try_send_update(&mut self, image: &VramImage) {
         let last = &self.buffers[self.last_buffer];
         if !image.changed(last) {
             return;
@@ -218,18 +218,18 @@ impl ImageState {
     }
 }
 
-struct ImageRendererWrapper<const N: usize, R: ImageRenderer<N>> {
+struct VramRendererWrapper<const N: usize, R: VramRenderer<N>> {
     renderer: R,
     params: Weak<Mutex<R::Params>>,
-    images: [ImageBuffer; N],
+    images: [VramImage; N],
-    states: [ImageState; N],
+    states: [VramRenderImageState; N],
 }
 
-trait ImageRendererImpl: Send {
+trait VramRendererImpl: Send {
     fn try_update(&mut self) -> Result<(), ()>;
 }
 
-impl<const N: usize, R: ImageRenderer<N> + Send> ImageRendererImpl for ImageRendererWrapper<N, R> {
+impl<const N: usize, R: VramRenderer<N> + Send> VramRendererImpl for VramRendererWrapper<N, R> {
     fn try_update(&mut self) -> Result<(), ()> {
         let params = match self.params.upgrade() {
             Some(params) => params.lock().unwrap().clone(),
@@ -247,12 +247,12 @@ impl<const N: usize, R: ImageRenderer<N> + Send> ImageRendererImpl for ImageRend
     }
 }
 
-pub struct ImageTextureLoader {
+pub struct VramTextureLoader {
-    cache: Mutex<HashMap<String, (ImageHandle, Option<TextureHandle>)>>,
+    cache: Mutex<HashMap<String, (VramImageHandle, Option<TextureHandle>)>>,
 }
 
-impl ImageTextureLoader {
+impl VramTextureLoader {
-    pub fn new(renderers: impl IntoIterator<Item = (String, ImageHandle)>) -> Self {
+    pub fn new(renderers: impl IntoIterator<Item = (String, VramImageHandle)>) -> Self {
         let mut cache = HashMap::new();
         for (key, image) in renderers {
             cache.insert(key, (image, None));
@@ -263,9 +263,9 @@ impl ImageTextureLoader {
     }
 }
 
-impl TextureLoader for ImageTextureLoader {
+impl TextureLoader for VramTextureLoader {
     fn id(&self) -> &str {
-        concat!(module_path!(), "ImageTextureLoader")
+        concat!(module_path!(), "VramTextureLoader")
     }
 
     fn load(

src/window.rs

@@ -3,10 +3,7 @@ use egui::{Context, ViewportBuilder, ViewportId};
 pub use game::GameWindow;
 pub use gdb::GdbServerWindow;
 pub use input::InputWindow;
-pub use shortcuts::ShortcutsWindow;
+pub use vram::{BgMapWindow, CharacterDataWindow, ObjectWindow, WorldWindow};
-pub use vip::{
-    BgMapWindow, CharacterDataWindow, FrameBufferWindow, ObjectWindow, RegisterWindow, WorldWindow,
-};
 use winit::event::KeyEvent;
 
 use crate::emulator::SimId;
@@ -16,9 +13,8 @@ mod game;
 mod game_screen;
 mod gdb;
 mod input;
-mod shortcuts;
 mod utils;
-mod vip;
+mod vram;
 
 pub trait AppWindow {
     fn viewport_id(&self) -> ViewportId;

src/window/game.rs

@@ -3,21 +3,20 @@ use std::sync::mpsc;
 use crate::{
     app::UserEvent,
     emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId, SimState},
-    input::{Command, ShortcutProvider},
     persistence::Persistence,
 };
 use egui::{
-    Align2, Button, CentralPanel, Color32, Context, Direction, Frame, TopBottomPanel, Ui, Vec2,
+    menu, Align2, Button, CentralPanel, Color32, Context, Direction, Frame, TopBottomPanel, Ui,
-    ViewportBuilder, ViewportCommand, ViewportId, Window, menu,
+    Vec2, ViewportBuilder, ViewportCommand, ViewportId, Window,
 };
 use egui_toast::{Toast, Toasts};
 use serde::{Deserialize, Serialize};
 use winit::event_loop::EventLoopProxy;
 
 use super::{
-    AppWindow,
     game_screen::{DisplayMode, GameScreen},
     utils::UiExt as _,
+    AppWindow,
 };
 
 const COLOR_PRESETS: [[Color32; 2]; 3] = [
@@ -39,7 +38,6 @@ pub struct GameWindow {
     client: EmulatorClient,
     proxy: EventLoopProxy<UserEvent>,
     persistence: Persistence,
-    shortcuts: ShortcutProvider,
     sim_id: SimId,
     config: GameConfig,
     screen: Option<GameScreen>,
@@ -52,7 +50,6 @@ impl GameWindow {
         client: EmulatorClient,
         proxy: EventLoopProxy<UserEvent>,
         persistence: Persistence,
-        shortcuts: ShortcutProvider,
         sim_id: SimId,
     ) -> Self {
         let config = load_config(&persistence, sim_id);
@@ -60,7 +57,6 @@ impl GameWindow {
             client,
             proxy,
             persistence,
-            shortcuts,
             sim_id,
             config,
             screen: None,
@@ -70,53 +66,8 @@ impl GameWindow {
     }
 
     fn show_menu(&mut self, ctx: &Context, ui: &mut Ui) {
-        let state = self.client.emulator_state();
-        let is_ready = self.client.sim_state(self.sim_id) == SimState::Ready;
-        let can_pause = is_ready && state == EmulatorState::Running;
-        let can_resume = is_ready && state == EmulatorState::Paused;
-        let can_frame_advance = is_ready && state != EmulatorState::Debugging;
-
-        for command in ui.input_mut(|input| self.shortcuts.consume_all(input)) {
-            match command {
-                Command::OpenRom => {
-                    let rom = rfd::FileDialog::new()
-                        .add_filter("Virtual Boy ROMs", &["vb", "vbrom"])
-                        .pick_file();
-                    if let Some(path) = rom {
-                        self.client
-                            .send_command(EmulatorCommand::LoadGame(self.sim_id, path));
-                    }
-                }
-                Command::Quit => {
-                    let _ = self.proxy.send_event(UserEvent::Quit(self.sim_id));
-                }
-                Command::PauseResume => {
-                    if state == EmulatorState::Paused && can_resume {
-                        self.client.send_command(EmulatorCommand::Resume);
-                    }
-                    if state == EmulatorState::Running && can_pause {
-                        self.client.send_command(EmulatorCommand::Pause);
-                    }
-                }
-                Command::Reset => {
-                    if is_ready {
-                        self.client
-                            .send_command(EmulatorCommand::Reset(self.sim_id));
-                    }
-                }
-                Command::FrameAdvance => {
-                    if can_frame_advance {
-                        self.client.send_command(EmulatorCommand::FrameAdvance);
-                    }
-                }
-            }
-        }
-
         ui.menu_button("ROM", |ui| {
-            if ui
+            if ui.button("Open ROM").clicked() {
-                .add(self.button_for(ui.ctx(), "Open ROM", Command::OpenRom))
-                .clicked()
-            {
                 let rom = rfd::FileDialog::new()
                     .add_filter("Virtual Boy ROMs", &["vb", "vbrom"])
                     .pick_file();
@@ -126,54 +77,29 @@ impl GameWindow {
                 }
                 ui.close_menu();
             }
-            if ui
+            if ui.button("Quit").clicked() {
-                .add(self.button_for(ui.ctx(), "Quit", Command::Quit))
-                .clicked()
-            {
                 let _ = self.proxy.send_event(UserEvent::Quit(self.sim_id));
             }
         });
         ui.menu_button("Emulation", |ui| {
+            let state = self.client.emulator_state();
+            let is_ready = self.client.sim_state(self.sim_id) == SimState::Ready;
+            let can_pause = is_ready && state == EmulatorState::Running;
+            let can_resume = is_ready && state == EmulatorState::Paused;
             if state == EmulatorState::Running {
-                if ui
+                if ui.add_enabled(can_pause, Button::new("Pause")).clicked() {
-                    .add_enabled(
-                        can_pause,
-                        self.button_for(ui.ctx(), "Pause", Command::PauseResume),
-                    )
-                    .clicked()
-                {
                     self.client.send_command(EmulatorCommand::Pause);
                     ui.close_menu();
                 }
-            } else if ui
+            } else if ui.add_enabled(can_resume, Button::new("Resume")).clicked() {
-                .add_enabled(
-                    can_resume,
-                    self.button_for(ui.ctx(), "Resume", Command::PauseResume),
-                )
-                .clicked()
-            {
                 self.client.send_command(EmulatorCommand::Resume);
                 ui.close_menu();
             }
-            if ui
+            if ui.add_enabled(is_ready, Button::new("Reset")).clicked() {
-                .add_enabled(is_ready, self.button_for(ui.ctx(), "Reset", Command::Reset))
-                .clicked()
-            {
                 self.client
                     .send_command(EmulatorCommand::Reset(self.sim_id));
                 ui.close_menu();
             }
-            ui.separator();
-            if ui
-                .add_enabled(
-                    can_frame_advance,
-                    self.button_for(ui.ctx(), "Frame Advance", Command::FrameAdvance),
-                )
-                .clicked()
-            {
-                self.client.send_command(EmulatorCommand::FrameAdvance);
-                ui.close_menu();
-            }
         });
         ui.menu_button("Options", |ui| self.show_options_menu(ctx, ui));
         ui.menu_button("Multiplayer", |ui| {
@@ -206,7 +132,6 @@ impl GameWindow {
                     .unwrap();
                 ui.close_menu();
             }
-            ui.separator();
             if ui.button("Character Data").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenCharacterData(self.sim_id))
@@ -231,18 +156,6 @@ impl GameWindow {
                     .unwrap();
                 ui.close_menu();
             }
-            if ui.button("Frame Buffers").clicked() {
-                self.proxy
-                    .send_event(UserEvent::OpenFrameBuffers(self.sim_id))
-                    .unwrap();
-                ui.close_menu();
-            }
-            if ui.button("Registers").clicked() {
-                self.proxy
-                    .send_event(UserEvent::OpenRegisters(self.sim_id))
-                    .unwrap();
-                ui.close_menu();
-            }
         });
         ui.menu_button("Help", |ui| {
             if ui.button("About").clicked() {
@@ -358,10 +271,6 @@ impl GameWindow {
                 ui.close_menu();
             }
         });
-        if ui.button("Key Shortcuts").clicked() {
-            self.proxy.send_event(UserEvent::OpenShortcuts).unwrap();
-            ui.close_menu();
-        }
     }
 
     fn show_color_picker(&mut self, ui: &mut Ui) {
@@ -403,14 +312,6 @@ impl GameWindow {
         }
         self.config = new_config;
     }
-
-    fn button_for(&self, ctx: &Context, text: &str, command: Command) -> Button {
-        let button = Button::new(text);
-        match self.shortcuts.shortcut_for(command) {
-            Some(shortcut) => button.shortcut_text(ctx.format_shortcut(&shortcut)),
-            None => button,
-        }
-    }
 }
 
 fn config_filename(sim_id: SimId) -> &'static str {

src/window/game_screen.rs

@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use egui::{Color32, Rgba, Vec2, Widget};
 use serde::{Deserialize, Serialize};
-use wgpu::{BindGroup, BindGroupLayout, Buffer, RenderPipeline, util::DeviceExt as _};
+use wgpu::{util::DeviceExt as _, BindGroup, BindGroupLayout, Buffer, RenderPipeline};
 
 use crate::graphics::TextureSink;
 

src/window/shortcuts.rs

@@ -1,103 +0,0 @@
-use egui::{
-    Button, CentralPanel, Context, Event, KeyboardShortcut, Label, Layout, Ui, ViewportBuilder,
-    ViewportId,
-};
-use egui_extras::{Column, TableBuilder};
-
-use crate::input::{Command, ShortcutProvider};
-
-use super::AppWindow;
-
-pub struct ShortcutsWindow {
-    shortcuts: ShortcutProvider,
-    now_binding: Option<Command>,
-}
-
-impl ShortcutsWindow {
-    pub fn new(shortcuts: ShortcutProvider) -> Self {
-        Self {
-            shortcuts,
-            now_binding: None,
-        }
-    }
-
-    fn show_shortcuts(&mut self, ui: &mut Ui) {
-        ui.horizontal(|ui| {
-            if ui.button("Use defaults").clicked() {
-                self.shortcuts.reset();
-            }
-        });
-        ui.separator();
-        let row_height = ui.spacing().interact_size.y;
-        let width = ui.available_width() - 20.0;
-        TableBuilder::new(ui)
-            .column(Column::exact(width * 0.3))
-            .column(Column::exact(width * 0.5))
-            .column(Column::exact(width * 0.2))
-            .cell_layout(Layout::left_to_right(egui::Align::Center))
-            .body(|mut body| {
-                for command in Command::all() {
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_sized(ui.available_size(), Label::new(command.name()));
-                        });
-                        row.col(|ui| {
-                            let button = if self.now_binding == Some(command) {
-                                Button::new("Binding...")
-                            } else if let Some(shortcut) = self.shortcuts.shortcut_for(command) {
-                                Button::new(ui.ctx().format_shortcut(&shortcut))
-                            } else {
-                                Button::new("")
-                            };
-                            if ui.add_sized(ui.available_size(), button).clicked() {
-                                self.now_binding = Some(command);
-                            }
-                        });
-                        row.col(|ui| {
-                            if ui
-                                .add_sized(ui.available_size(), Button::new("Clear"))
-                                .clicked()
-                            {
-                                self.shortcuts.unset(command);
-                                self.now_binding = None;
-                            }
-                        });
-                    });
-                }
-            });
-        if let Some(command) = self.now_binding {
-            if let Some(shortcut) = ui.input_mut(|i| {
-                i.events.iter().find_map(|event| match event {
-                    Event::Key {
-                        key,
-                        pressed: true,
-                        modifiers,
-                        ..
-                    } => Some(KeyboardShortcut::new(*modifiers, *key)),
-                    _ => None,
-                })
-            }) {
-                self.shortcuts.set(command, shortcut);
-                self.now_binding = None;
-            }
-        }
-    }
-}
-
-impl AppWindow for ShortcutsWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of("shortcuts")
-    }
-
-    fn initial_viewport(&self) -> ViewportBuilder {
-        ViewportBuilder::default()
-            .with_title("Keyboard Shortcuts")
-            .with_inner_size((400.0, 400.0))
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
-            self.show_shortcuts(ui);
-        });
-    }
-}

src/window/utils.rs

@@ -1,16 +1,15 @@
 use std::{
-    fmt::{Display, UpperHex},
+    fmt::Display,
     ops::{Bound, RangeBounds},
     str::FromStr,
 };
 
-use atoi::FromRadix16;
 use egui::{
-    Align, Color32, CursorIcon, Event, Frame, Key, Layout, Margin, Rect, Response, RichText,
+    ecolor::HexColor, Align, Color32, CursorIcon, Event, Frame, Key, Layout, Margin, Rect,
-    Rounding, Sense, Shape, Stroke, TextEdit, Ui, UiBuilder, Vec2, Widget, WidgetText,
+    Response, RichText, Rounding, Sense, Shape, Stroke, TextEdit, Ui, UiBuilder, Vec2, Widget,
-    ecolor::HexColor,
+    WidgetText,
 };
-use num_traits::{CheckedAdd, CheckedSub, One};
+use num_traits::PrimInt;
 
 pub trait UiExt {
     fn section(&mut self, title: impl Into<String>, add_contents: impl FnOnce(&mut Ui));
@@ -35,24 +34,19 @@ pub trait UiExt {
 
 impl UiExt for Ui {
     fn section(&mut self, title: impl Into<String>, add_contents: impl FnOnce(&mut Ui)) {
-        let title: String = title.into();
         let mut frame = Frame::group(self.style());
         frame.outer_margin.top += 10.0;
         frame.inner_margin.top += 2.0;
-        let res = self.push_id(&title, |ui| {
+        let res = frame.show(self, add_contents);
-            frame.show(ui, |ui| {
-                ui.set_max_width(ui.available_width());
-                add_contents(ui);
-            })
-        });
         let text = RichText::new(title).background_color(self.style().visuals.panel_fill);
         let old_rect = res.response.rect;
         let mut text_rect = old_rect;
         text_rect.min.x += 6.0;
-        self.allocate_new_ui(UiBuilder::new().max_rect(text_rect), |ui| ui.label(text));
+        let new_rect = self
-        if old_rect.width() > 0.0 {
+            .allocate_new_ui(UiBuilder::new().max_rect(text_rect), |ui| ui.label(text))
-            self.advance_cursor_after_rect(old_rect);
+            .response
-        }
+            .rect;
+        self.allocate_space((old_rect.max - new_rect.max) - (old_rect.min - new_rect.min));
     }
 
     fn selectable_button(&mut self, selected: bool, text: impl Into<WidgetText>) -> Response {
@@ -102,49 +96,14 @@ enum Direction {
     Down,
 }
 
-pub trait Number:
+pub trait Number: PrimInt + Display + FromStr + Send + Sync + 'static {}
-    Copy
+impl<T: PrimInt + Display + FromStr + Send + Sync + 'static> Number for T {}
-    + One
-    + CheckedAdd
-    + CheckedSub
-    + Eq
-    + Ord
-    + Display
-    + FromStr
-    + FromRadix16
-    + UpperHex
-    + Send
-    + Sync
-    + 'static
-{
-}
-impl<
-    T: Copy
-        + One
-        + CheckedAdd
-        + CheckedSub
-        + Eq
-        + Ord
-        + Display
-        + FromStr
-        + FromRadix16
-        + UpperHex
-        + Send
-        + Sync
-        + 'static,
-> Number for T
-{
-}
 
 pub struct NumberEdit<'a, T: Number> {
     value: &'a mut T,
     increment: T,
-    precision: usize,
     min: Option<T>,
     max: Option<T>,
-    desired_width: Option<f32>,
-    arrows: bool,
-    hex: bool,
 }
 
 impl<'a, T: Number> NumberEdit<'a, T> {
@@ -152,19 +111,11 @@ impl<'a, T: Number> NumberEdit<'a, T> {
         Self {
             value,
             increment: T::one(),
-            precision: 3,
             min: None,
             max: None,
-            desired_width: None,
-            arrows: true,
-            hex: false,
         }
     }
 
-    pub fn precision(self, precision: usize) -> Self {
-        Self { precision, ..self }
-    }
-
     pub fn range(self, range: impl RangeBounds<T>) -> Self {
         let min = match range.start_bound() {
             Bound::Unbounded => None,
@@ -178,57 +129,24 @@ impl<'a, T: Number> NumberEdit<'a, T> {
         };
         Self { min, max, ..self }
     }
-
-    pub fn desired_width(self, desired_width: f32) -> Self {
-        Self {
-            desired_width: Some(desired_width),
-            ..self
-        }
-    }
-
-    pub fn arrows(self, arrows: bool) -> Self {
-        Self { arrows, ..self }
-    }
-
-    pub fn hex(self, hex: bool) -> Self {
-        Self { hex, ..self }
-    }
 }
 
 impl<T: Number> Widget for NumberEdit<'_, T> {
     fn ui(self, ui: &mut Ui) -> Response {
-        let id = ui.id();
-        let to_string = |val: &T| {
-            if self.hex {
-                format!("{val:.0$X}", self.precision)
-            } else {
-                format!("{val:.0$}", self.precision)
-            }
-        };
-        let from_string = |val: &str| {
-            if self.hex {
-                let bytes = val.as_bytes();
-                let (result, consumed) = T::from_radix_16(bytes);
-                (consumed == bytes.len()).then_some(result)
-            } else {
-                val.parse::<T>().ok()
-            }
-        };
-
         let (last_value, mut str, focus) = ui.memory(|m| {
             let (lv, s) = m
                 .data
-                .get_temp(id)
+                .get_temp(ui.id())
-                .unwrap_or((*self.value, to_string(self.value)));
+                .unwrap_or((*self.value, self.value.to_string()));
-            let focus = m.has_focus(id);
+            let focus = m.has_focus(ui.id());
             (lv, s, focus)
         });
         let mut stale = false;
         if *self.value != last_value {
-            str = to_string(self.value);
+            str = self.value.to_string();
             stale = true;
         }
-        let valid = from_string(&str).is_some_and(|v: T| v == *self.value);
+        let valid = str.parse().is_ok_and(|v: T| v == *self.value);
         let mut up_pressed = false;
         let mut down_pressed = false;
         if focus {
@@ -254,37 +172,22 @@ impl<T: Number> Widget for NumberEdit<'_, T> {
                 })
             });
         }
-        let mut desired_width = self
-            .desired_width
-            .unwrap_or_else(|| ui.spacing().text_edit_width);
-        if self.arrows {
-            desired_width -= 16.0;
-        }
         let text = TextEdit::singleline(&mut str)
             .horizontal_align(Align::Max)
-            .id(id)
+            .id(ui.id())
-            .desired_width(desired_width)
             .margin(Margin {
                 left: 4.0,
-                right: if self.arrows { 20.0 } else { 4.0 },
+                right: 20.0,
                 top: 2.0,
                 bottom: 2.0,
             });
-        let mut res = if valid {
+        let res = if valid {
             ui.add(text)
         } else {
             let message = match (self.min, self.max) {
-                (Some(min), Some(max)) => format!(
+                (Some(min), Some(max)) => format!("Please enter a number between {min} and {max}."),
-                    "Please enter a number between {} and {}.",
+                (Some(min), None) => format!("Please enter a number greater than {min}."),
-                    to_string(&min),
+                (None, Some(max)) => format!("Please enter a number less than {max}."),
-                    to_string(&max)
-                ),
-                (Some(min), None) => {
-                    format!("Please enter a number greater than {}.", to_string(&min))
-                }
-                (None, Some(max)) => {
-                    format!("Please enter a number less than {}.", to_string(&max))
-                }
                 (None, None) => "Please enter a number.".to_string(),
             };
             ui.scope(|ui| {
@@ -298,14 +201,13 @@ impl<T: Number> Widget for NumberEdit<'_, T> {
             .on_hover_text(message)
         };
 
-        let mut delta = None;
-        if self.arrows {
         let arrow_left = res.rect.max.x + 4.0;
         let arrow_right = res.rect.max.x + 20.0;
         let arrow_top = res.rect.min.y - 2.0;
         let arrow_middle = (res.rect.min.y + res.rect.max.y) / 2.0;
         let arrow_bottom = res.rect.max.y + 2.0;
 
+        let mut delta = None;
         let top_arrow_rect = Rect {
             min: (arrow_left, arrow_top).into(),
             max: (arrow_right, arrow_middle).into(),
@@ -320,7 +222,6 @@ impl<T: Number> Widget for NumberEdit<'_, T> {
         if draw_arrow(ui, bottom_arrow_rect, false).clicked_or_dragged() || down_pressed {
             delta = Some(Direction::Down);
         }
-        }
 
         let in_range =
             |val: &T| self.min.is_none_or(|m| &m <= val) && self.max.is_none_or(|m| &m >= val);
@@ -330,24 +231,18 @@ impl<T: Number> Widget for NumberEdit<'_, T> {
                 Direction::Down => self.value.checked_sub(&self.increment),
             };
             if let Some(new_value) = value.filter(in_range) {
-                if *self.value != new_value {
-                    res.mark_changed();
-                }
                 *self.value = new_value;
             }
-            str = to_string(self.value);
+            str = self.value.to_string();
             stale = true;
         } else if res.changed {
-            if let Some(new_value) = from_string(&str).filter(in_range) {
+            if let Some(new_value) = str.parse().ok().filter(in_range) {
-                if *self.value != new_value {
-                    res.mark_changed();
-                }
                 *self.value = new_value;
             }
             stale = true;
         }
         if stale {
-            ui.memory_mut(|m| m.data.insert_temp(id, (*self.value, str)));
+            ui.memory_mut(|m| m.data.insert_temp(ui.id(), (*self.value, str)));
         }
         res
     }

src/window/vip/framebuffer.rs

@@ -1,267 +0,0 @@
-use std::sync::Arc;
-
-use egui::{
-    Align, CentralPanel, Color32, Context, Image, ScrollArea, Slider, TextEdit, TextureOptions, Ui,
-    ViewportBuilder, ViewportId,
-};
-use egui_extras::{Column, Size, StripBuilder, TableBuilder};
-
-use crate::{
-    emulator::SimId,
-    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
-    memory::{MemoryClient, MemoryView},
-    window::{
-        AppWindow,
-        utils::{NumberEdit, UiExt as _},
-    },
-};
-
-use super::utils;
-
-pub struct FrameBufferWindow {
-    sim_id: SimId,
-    loader: Arc<ImageTextureLoader>,
-    index: usize,
-    left: bool,
-    right: bool,
-    generic_palette: bool,
-    params: ImageParams<FrameBufferParams>,
-    scale: f32,
-}
-
-impl FrameBufferWindow {
-    pub fn new(sim_id: SimId, memory: &MemoryClient, images: &mut ImageProcessor) -> Self {
-        let initial_params = FrameBufferParams {
-            index: 0,
-            left: true,
-            right: true,
-            generic_palette: false,
-            left_color: Color32::from_rgb(0xff, 0x00, 0x00),
-            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)]);
-        Self {
-            sim_id,
-            loader: Arc::new(loader),
-            index: params.index,
-            left: params.left,
-            right: params.right,
-            generic_palette: params.generic_palette,
-            params,
-            scale: 2.0,
-        }
-    }
-
-    fn show_form(&mut self, ui: &mut Ui) {
-        let row_height = ui.spacing().interact_size.y;
-        ui.vertical(|ui| {
-            TableBuilder::new(ui)
-                .column(Column::auto())
-                .column(Column::remainder())
-                .body(|mut body| {
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("Index");
-                        });
-                        row.col(|ui| {
-                            ui.add(NumberEdit::new(&mut self.index).range(0..2));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("Left");
-                        });
-                        row.col(|ui| {
-                            let address = self.index * 0x00008000;
-                            let mut address_str = format!("{address:08x}");
-                            ui.add_enabled(
-                                false,
-                                TextEdit::singleline(&mut address_str).horizontal_align(Align::Max),
-                            );
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("Right");
-                        });
-                        row.col(|ui| {
-                            let address = self.index * 0x00008000 + 0x00010000;
-                            let mut address_str = format!("{address:08x}");
-                            ui.add_enabled(
-                                false,
-                                TextEdit::singleline(&mut address_str).horizontal_align(Align::Max),
-                            );
-                        });
-                    });
-                });
-            ui.section("Display", |ui| {
-                ui.horizontal(|ui| {
-                    ui.label("Scale");
-                    ui.spacing_mut().slider_width = ui.available_width();
-                    let slider = Slider::new(&mut self.scale, 1.0..=10.0)
-                        .step_by(1.0)
-                        .show_value(false);
-                    ui.add(slider);
-                });
-                TableBuilder::new(ui)
-                    .columns(Column::remainder(), 2)
-                    .body(|mut body| {
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.checkbox(&mut self.left, "Left");
-                            });
-                            row.col(|ui| {
-                                ui.checkbox(&mut self.right, "Right");
-                            });
-                        });
-                    });
-                ui.checkbox(&mut self.generic_palette, "Generic colors");
-            });
-        });
-
-        self.params.write(FrameBufferParams {
-            index: self.index,
-            left: self.left,
-            right: self.right,
-            generic_palette: self.generic_palette,
-            ..*self.params
-        });
-    }
-
-    fn show_buffers(&mut self, ui: &mut Ui) {
-        let image = Image::new("vip://buffer")
-            .fit_to_original_size(self.scale)
-            .texture_options(TextureOptions::NEAREST);
-        ui.add(image);
-    }
-}
-
-impl AppWindow for FrameBufferWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of(format!("framebuffer-{}", self.sim_id))
-    }
-
-    fn sim_id(&self) -> SimId {
-        self.sim_id
-    }
-
-    fn initial_viewport(&self) -> ViewportBuilder {
-        ViewportBuilder::default()
-            .with_title(format!("Frame Buffers ({})", self.sim_id))
-            .with_inner_size((640.0, 480.0))
-    }
-
-    fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
-        ctx.add_texture_loader(self.loader.clone());
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
-            ui.horizontal_top(|ui| {
-                StripBuilder::new(ui)
-                    .size(Size::relative(0.3).at_most(200.0))
-                    .size(Size::remainder())
-                    .horizontal(|mut strip| {
-                        strip.cell(|ui| {
-                            ScrollArea::vertical().show(ui, |ui| self.show_form(ui));
-                        });
-                        strip.cell(|ui| {
-                            ScrollArea::both().show(ui, |ui| self.show_buffers(ui));
-                        });
-                    });
-            });
-        });
-    }
-}
-
-#[derive(Clone, PartialEq, Eq)]
-struct FrameBufferParams {
-    index: usize,
-    left: bool,
-    right: bool,
-    generic_palette: bool,
-    left_color: Color32,
-    right_color: Color32,
-}
-
-struct FrameBufferRenderer {
-    buffers: [MemoryView; 4],
-    brightness: MemoryView,
-}
-
-impl FrameBufferRenderer {
-    fn new(sim_id: SimId, memory: &MemoryClient) -> Self {
-        Self {
-            buffers: [
-                memory.watch(sim_id, 0x00000000, 0x6000),
-                memory.watch(sim_id, 0x00008000, 0x6000),
-                memory.watch(sim_id, 0x00010000, 0x6000),
-                memory.watch(sim_id, 0x00018000, 0x6000),
-            ],
-            brightness: memory.watch(sim_id, 0x0005f824, 8),
-        }
-    }
-}
-
-impl ImageRenderer<1> for FrameBufferRenderer {
-    type Params = FrameBufferParams;
-
-    fn sizes(&self) -> [[usize; 2]; 1] {
-        [[384, 224]]
-    }
-
-    fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; 1]) {
-        let image = &mut images[0];
-
-        let left_buffer = self.buffers[params.index].borrow();
-        let right_buffer = self.buffers[2 + params.index].borrow();
-
-        let colors = if params.generic_palette {
-            [
-                utils::generic_palette(params.left_color),
-                utils::generic_palette(params.right_color),
-            ]
-        } else {
-            let brts = self.brightness.borrow().read::<[u8; 8]>(0);
-            let shades = utils::parse_shades(&brts);
-            [
-                shades.map(|s| utils::shade(s, params.left_color)),
-                shades.map(|s| utils::shade(s, params.right_color)),
-            ]
-        };
-
-        let left_cols = left_buffer.range::<u8>(0, 0x6000);
-        let right_cols = right_buffer.range::<u8>(0, 0x6000);
-        for (index, (left, right)) in left_cols.zip(right_cols).enumerate() {
-            let top = (index % 64) * 4;
-            if top >= 224 {
-                continue;
-            }
-
-            let pixels = [0, 2, 4, 6].map(|i| {
-                let left = if params.left {
-                    colors[0][(left >> i) as usize & 0x3]
-                } else {
-                    Color32::BLACK
-                };
-                let right = if params.right {
-                    colors[1][(right >> i) as usize & 0x3]
-                } else {
-                    Color32::BLACK
-                };
-                Color32::from_rgb(
-                    left.r() + right.r(),
-                    left.g() + right.g(),
-                    left.b() + right.b(),
-                )
-            });
-            let x = index / 64;
-            for (i, pixel) in pixels.into_iter().enumerate() {
-                let y = top + i;
-                image.write((x, y), pixel);
-            }
-        }
-    }
-}

src/window/vip/registers.rs

@@ -1,819 +0,0 @@
-use std::sync::Arc;
-
-use egui::{
-    Align, Button, CentralPanel, Checkbox, Color32, Context, Direction, Label, Layout, ScrollArea,
-    TextEdit, Ui, ViewportBuilder, ViewportId,
-};
-use egui_extras::{Column, Size, StripBuilder, TableBuilder};
-
-use crate::{
-    emulator::SimId,
-    memory::{MemoryClient, MemoryRef, MemoryValue, MemoryView},
-    window::{
-        AppWindow,
-        utils::{NumberEdit, UiExt},
-    },
-};
-
-use super::utils;
-
-pub struct RegisterWindow {
-    sim_id: SimId,
-    memory: Arc<MemoryClient>,
-    registers: MemoryView,
-}
-
-impl RegisterWindow {
-    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>) -> Self {
-        Self {
-            sim_id,
-            memory: memory.clone(),
-            registers: memory.watch(sim_id, 0x0005f800, 0x72),
-        }
-    }
-
-    fn show_interrupts(&mut self, ui: &mut Ui) {
-        let row_height = self.row_height(ui);
-        let [mut raw_intpnd, mut raw_intenb] = self.read_address(0x0005f800);
-        let mut intenb = InterruptReg::parse(raw_intenb);
-        let mut intpnd = InterruptReg::parse(raw_intpnd);
-        ui.section("Interrupt", |ui| {
-            let width = ui.available_width();
-            let xspace = ui.spacing().item_spacing.x;
-            ui.with_layout(Layout::top_down_justified(Align::Center), |ui| {
-                TableBuilder::new(ui)
-                    .id_salt("raw_values")
-                    .columns(Column::exact(width * 0.5 - xspace), 2)
-                    .cell_layout(Layout::left_to_right(Align::Max))
-                    .body(|mut body| {
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.label("INTENB");
-                            });
-                            row.col(|ui| {
-                                let mut text = format!("{raw_intenb:04x}");
-                                ui.add_sized(
-                                    ui.available_size(),
-                                    TextEdit::singleline(&mut text).horizontal_align(Align::Max),
-                                );
-                            });
-                        });
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.label("INTPND");
-                            });
-                            row.col(|ui| {
-                                let mut text = format!("{raw_intpnd:04x}");
-                                ui.add_enabled(
-                                    false,
-                                    TextEdit::singleline(&mut text).horizontal_align(Align::Max),
-                                );
-                            });
-                        });
-                    });
-                ui.add_space(8.0);
-                TableBuilder::new(ui)
-                    .id_salt("flags")
-                    .column(Column::exact(width * 0.5 - xspace))
-                    .columns(Column::exact(width * 0.25 - xspace), 2)
-                    .cell_layout(Layout::left_to_right(Align::Center).with_main_align(Align::RIGHT))
-                    .body(|mut body| {
-                        body.row(row_height, |mut row| {
-                            row.col(|_ui| {});
-                            row.col(|ui| {
-                                ui.add_sized(ui.available_size(), Label::new("ENB"));
-                            });
-                            row.col(|ui| {
-                                ui.add_sized(ui.available_size(), Label::new("PND"));
-                            });
-                        });
-                        let mut add_row = |label: &str, enb: &mut bool, pnd: &mut bool| {
-                            body.row(row_height, |mut row| {
-                                row.col(|ui| {
-                                    ui.label(label);
-                                });
-                                row.col(|ui| {
-                                    let space =
-                                        (ui.available_width() - ui.spacing().icon_width) / 2.0;
-                                    ui.add_space(space);
-                                    ui.checkbox(enb, "");
-                                });
-                                row.col(|ui| {
-                                    let space =
-                                        (ui.available_width() - ui.spacing().icon_width) / 2.0;
-                                    ui.add_space(space);
-                                    ui.checkbox(pnd, "");
-                                });
-                            });
-                        };
-                        add_row("TIMEERR", &mut intenb.timeerr, &mut intpnd.timeerr);
-                        add_row("XPEND", &mut intenb.xpend, &mut intpnd.xpend);
-                        add_row("SBHIT", &mut intenb.sbhit, &mut intpnd.sbhit);
-                        add_row("FRAMESTART", &mut intenb.framestart, &mut intpnd.framestart);
-                        add_row("GAMESTART", &mut intenb.gamestart, &mut intpnd.gamestart);
-                        add_row("RFBEND", &mut intenb.rfbend, &mut intpnd.rfbend);
-                        add_row("LFBEND", &mut intenb.lfbend, &mut intpnd.lfbend);
-                        add_row("SCANERR", &mut intenb.scanerr, &mut intpnd.scanerr);
-                    });
-            });
-            ui.allocate_space(ui.available_size());
-        });
-        if intpnd.update(&mut raw_intpnd) {
-            self.memory.write(self.sim_id, 0x0005f800, &raw_intpnd);
-        }
-        if intenb.update(&mut raw_intenb) {
-            self.memory.write(self.sim_id, 0x0005f802, &raw_intenb);
-        }
-    }
-
-    fn show_display_status(&mut self, ui: &mut Ui) {
-        let row_height = self.row_height(ui);
-        let mut raw_dpstts = self.read_address(0x0005f820);
-        let mut dpstts = DisplayReg::parse(raw_dpstts);
-        ui.section("Display", |ui| {
-            let width = ui.available_width();
-            TableBuilder::new(ui)
-                .column(Column::exact(width * 0.5))
-                .column(Column::exact(width * 0.5))
-                .cell_layout(Layout::left_to_right(Align::Max))
-                .body(|mut body| {
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("DPSTTS");
-                        });
-                        row.col(|ui| {
-                            let mut value_str = format!("{raw_dpstts:04x}");
-                            ui.add_enabled(
-                                false,
-                                TextEdit::singleline(&mut value_str).horizontal_align(Align::Max),
-                            );
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_enabled(true, Checkbox::new(&mut dpstts.lock, "LOCK"));
-                        });
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut dpstts.r1bsy, "R1BSY"));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_enabled(true, Checkbox::new(&mut dpstts.synce, "SYNCE"));
-                        });
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut dpstts.l1bsy, "L1BSY"));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_enabled(true, Checkbox::new(&mut dpstts.re, "RE"));
-                        });
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut dpstts.r0bsy, "R0BSY"));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut dpstts.fclk, "FCLK"));
-                        });
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut dpstts.l0bsy, "L0BSY"));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut dpstts.scanrdy, "SCANRDY"));
-                        });
-                        row.col(|ui| {
-                            ui.add_enabled(true, Checkbox::new(&mut dpstts.disp, "DISP"));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|_ui| {});
-                        row.col(|ui| {
-                            if ui
-                                .add(Button::new("DPRST").min_size(ui.available_size()))
-                                .clicked()
-                            {
-                                dpstts.dprst = true;
-                            }
-                        });
-                    });
-                });
-            ui.allocate_space(ui.available_size());
-        });
-        if dpstts.update(&mut raw_dpstts) {
-            self.memory.write(self.sim_id, 0x0005f822, &raw_dpstts);
-        }
-    }
-
-    fn show_drawing_status(&mut self, ui: &mut Ui) {
-        let row_height = self.row_height(ui);
-        let [mut raw_xpstts, raw_xpctrl] = self.read_address(0x0005f840);
-        let mut xpstts = DrawingReg::parse(raw_xpstts);
-        ui.section("Drawing", |ui| {
-            let width = ui.available_width();
-            TableBuilder::new(ui)
-                .column(Column::exact(width * 0.5))
-                .column(Column::exact(width * 0.5))
-                .cell_layout(Layout::left_to_right(Align::Max))
-                .body(|mut body| {
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("XPCTRL");
-                        });
-                        row.col(|ui| {
-                            let mut value_str = format!("{raw_xpctrl:04x}");
-                            ui.add_enabled(
-                                false,
-                                TextEdit::singleline(&mut value_str).horizontal_align(Align::Max),
-                            );
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("XPSTTS");
-                        });
-                        row.col(|ui| {
-                            let mut value_str = format!("{raw_xpstts:04x}");
-                            ui.add_enabled(
-                                false,
-                                TextEdit::singleline(&mut value_str).horizontal_align(Align::Max),
-                            );
-                        });
-                    });
-                    /*
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("SBCMP");
-                        });
-                        row.col(|ui| {
-                            let old_value = xpctrl.sbcmp;
-                            ui.add_enabled(true, NumberEdit::new(&mut xpctrl.sbcmp).range(0..32));
-                            cmp_changed = xpctrl.sbcmp != old_value;
-                        });
-                    });
-                     */
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("SBCOUNT");
-                        });
-                        row.col(|ui| {
-                            ui.add_enabled(
-                                false,
-                                NumberEdit::new(&mut xpstts.sbcount)
-                                    .arrows(false)
-                                    .range(0..32),
-                            );
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut xpstts.sbout, "SBOUT"));
-                        });
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut xpstts.f1bsy, "F1BSY"));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut xpstts.f0bsy, "F0BSY"));
-                        });
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut xpstts.overtime, "OVERTIME"));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_enabled(true, Checkbox::new(&mut xpstts.xpen, "XPEN"));
-                        });
-                        row.col(|ui| {
-                            if ui
-                                .add(Button::new("XPRST").min_size(ui.available_size()))
-                                .clicked()
-                            {
-                                xpstts.xprst = true;
-                            }
-                        });
-                    });
-                });
-            ui.allocate_space(ui.available_size());
-        });
-        if xpstts.update(&mut raw_xpstts) {
-            xpstts.update(&mut raw_xpstts);
-            self.memory.write(self.sim_id, 0x0005f842, &raw_xpstts);
-        }
-    }
-
-    fn show_colors(&mut self, ui: &mut Ui) {
-        let row_height = self.row_height(ui);
-        let registers = self.registers.borrow();
-        ui.section("Colors", |ui| {
-            let width = ui.available_width();
-            let xspace = ui.spacing().item_spacing.x;
-            TableBuilder::new(ui)
-                .column(Column::exact(width * 0.2 - xspace))
-                .columns(Column::exact(width * 0.20 - xspace), 4)
-                .cell_layout(Layout::left_to_right(Align::Max))
-                .body(|mut body| {
-                    body.row(row_height, |mut row| {
-                        row.col(|_ui| {});
-                        row.col(|_ui| {});
-                        row.col(|ui| {
-                            ui.with_layout(
-                                Layout::centered_and_justified(Direction::LeftToRight),
-                                |ui| ui.label("1"),
-                            );
-                        });
-                        row.col(|ui| {
-                            ui.with_layout(
-                                Layout::centered_and_justified(Direction::LeftToRight),
-                                |ui| ui.label("2"),
-                            );
-                        });
-                        row.col(|ui| {
-                            ui.with_layout(
-                                Layout::centered_and_justified(Direction::LeftToRight),
-                                |ui| ui.label("3"),
-                            );
-                        });
-                    });
-                    let mut brts: [u16; 3] = [
-                        read_address(&registers, 0x0005f824),
-                        read_address(&registers, 0x0005f826),
-                        read_address(&registers, 0x0005f828),
-                    ];
-                    body.row(row_height, |mut row| {
-                        let mut stale = false;
-                        row.col(|ui| {
-                            ui.label("BRT");
-                        });
-                        row.col(|_ui| {});
-                        for brt in brts.iter_mut() {
-                            row.col(|ui| {
-                                if ui
-                                    .add(NumberEdit::new(brt).range(0..256).arrows(false).hex(true))
-                                    .changed()
-                                {
-                                    stale = true;
-                                }
-                            });
-                        }
-                        if stale {
-                            self.memory.write(self.sim_id, 0x0005f824, &brts);
-                        }
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|_ui| {});
-                        for shade in utils::parse_brts(&brts, Color32::RED) {
-                            row.col(|ui| {
-                                ui.painter().rect_filled(
-                                    ui.available_rect_before_wrap(),
-                                    0.0,
-                                    shade,
-                                );
-                            });
-                        }
-                    });
-                    let mut palettes = read_address::<[u16; 8]>(&registers, 0x0005f860);
-                    let mut add_row = |name: &str, address: u32, value: &mut u16| {
-                        let mut c1 = (*value >> 2) & 0x03;
-                        let mut c2 = (*value >> 4) & 0x03;
-                        let mut c3 = (*value >> 6) & 0x03;
-                        let mut stale = false;
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.label(name);
-                            });
-                            row.col(|ui| {
-                                if ui
-                                    .add(
-                                        NumberEdit::new(value)
-                                            .range(0..256)
-                                            .desired_width(width * 0.2)
-                                            .arrows(false)
-                                            .hex(true),
-                                    )
-                                    .changed()
-                                {
-                                    stale = true;
-                                };
-                            });
-                            row.col(|ui| {
-                                if ui
-                                    .add(
-                                        NumberEdit::new(&mut c1)
-                                            .range(0..4)
-                                            .desired_width(ui.available_width() - xspace),
-                                    )
-                                    .changed()
-                                {
-                                    *value = (*value & 0xfff3) | (c1 << 2);
-                                    stale = true;
-                                }
-                            });
-                            row.col(|ui| {
-                                if ui
-                                    .add(
-                                        NumberEdit::new(&mut c2)
-                                            .range(0..4)
-                                            .desired_width(ui.available_width() - xspace),
-                                    )
-                                    .changed()
-                                {
-                                    *value = (*value & 0xffcf) | (c2 << 4);
-                                    stale = true;
-                                }
-                            });
-                            row.col(|ui| {
-                                if ui
-                                    .add(
-                                        NumberEdit::new(&mut c3)
-                                            .range(0..4)
-                                            .desired_width(ui.available_width() - xspace),
-                                    )
-                                    .changed()
-                                {
-                                    *value = (*value & 0xff3f) | (c3 << 6);
-                                    stale = true;
-                                }
-                            });
-                        });
-                        if stale {
-                            self.memory.write(self.sim_id, address, value);
-                        }
-                    };
-
-                    add_row("GPLT0", 0x0005f860, &mut palettes[0]);
-                    add_row("GPLT1", 0x0005f862, &mut palettes[1]);
-                    add_row("GPLT2", 0x0005f864, &mut palettes[2]);
-                    add_row("GPLT3", 0x0005f866, &mut palettes[3]);
-                    add_row("JPLT0", 0x0005f868, &mut palettes[4]);
-                    add_row("JPLT1", 0x0005f86a, &mut palettes[5]);
-                    add_row("JPLT2", 0x0005f86c, &mut palettes[6]);
-                    add_row("JPLT3", 0x0005f86e, &mut palettes[7]);
-
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("BKCOL");
-                        });
-                        row.col(|ui| {
-                            let mut bkcol: u16 = read_address(&registers, 0x0005f870);
-                            if ui
-                                .add(
-                                    NumberEdit::new(&mut bkcol)
-                                        .range(0..4)
-                                        .desired_width(ui.available_width() - xspace),
-                                )
-                                .changed()
-                            {
-                                self.memory.write(self.sim_id, 0x0005f870, &bkcol);
-                            }
-                        });
-                        row.col(|_ui| {});
-                        row.col(|ui| {
-                            ui.label("REST");
-                        });
-                        row.col(|ui| {
-                            let mut rest: u16 = read_address(&registers, 0x0005f82a);
-                            if ui
-                                .add(
-                                    NumberEdit::new(&mut rest)
-                                        .range(0..256)
-                                        .arrows(false)
-                                        .hex(true),
-                                )
-                                .changed()
-                            {
-                                self.memory.write(self.sim_id, 0x0005f82a, &rest);
-                            }
-                        });
-                    });
-                });
-
-            ui.allocate_space(ui.available_size_before_wrap());
-        });
-    }
-
-    fn show_objects(&mut self, ui: &mut Ui) {
-        let row_height = self.row_height(ui);
-        ui.section("Objects", |ui| {
-            let width = ui.available_width();
-            let xspace = ui.spacing().item_spacing.x;
-            TableBuilder::new(ui)
-                .column(Column::exact(width * 0.3 - xspace))
-                .column(Column::exact(width * 0.3 - xspace))
-                .column(Column::exact(width * 0.4 - xspace))
-                .cell_layout(Layout::left_to_right(Align::Center).with_main_align(Align::RIGHT))
-                .body(|mut body| {
-                    body.row(row_height, |mut row| {
-                        row.col(|_ui| {});
-                        row.col(|ui| {
-                            ui.add_sized(ui.available_size(), Label::new("Start"));
-                        });
-                        row.col(|ui| {
-                            ui.add_sized(ui.available_size(), Label::new("End"));
-                        });
-                    });
-                    let mut spts = self.read_address::<[u16; 4]>(0x0005f848);
-                    let prevs = std::iter::once(0u16).chain(spts.map(|i| (i + 1) & 0x03ff));
-                    let mut changed = false;
-                    for (index, (spt, prev)) in spts.iter_mut().zip(prevs).enumerate() {
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.label(format!("SPT{index}"));
-                            });
-                            row.col(|ui| {
-                                ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
-                                    ui.label(prev.to_string());
-                                });
-                            });
-                            row.col(|ui| {
-                                if ui.add(NumberEdit::new(spt).range(0..1024)).changed() {
-                                    changed = true;
-                                }
-                            });
-                        });
-                    }
-                    if changed {
-                        self.memory.write(self.sim_id, 0x0005f848, &spts);
-                    }
-                });
-            ui.allocate_space(ui.available_size_before_wrap());
-        });
-    }
-
-    fn show_misc(&mut self, ui: &mut Ui) {
-        let row_height = self.row_height(ui);
-        let registers = self.registers.borrow();
-        ui.section("Misc.", |ui| {
-            let width = ui.available_width();
-            let xspace = ui.spacing().item_spacing.x;
-            TableBuilder::new(ui)
-                .column(Column::exact(width * 0.5 - xspace))
-                .column(Column::exact(width * 0.5 - xspace))
-                .cell_layout(Layout::left_to_right(Align::Center).with_main_align(Align::RIGHT))
-                .body(|mut body| {
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("FRMCYC");
-                        });
-                        row.col(|ui| {
-                            let mut frmcyc = read_address::<u16>(&registers, 0x0005f82e);
-                            ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
-                                if ui.add(NumberEdit::new(&mut frmcyc).range(0..32)).changed() {
-                                    self.memory.write(self.sim_id, 0x0005f82e, &frmcyc);
-                                }
-                            });
-                        });
-                    });
-                    let mut cta = read_address::<u16>(&registers, 0x0005f830);
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("CTA");
-                        });
-                        row.col(|ui| {
-                            ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
-                                ui.add_enabled(
-                                    false,
-                                    NumberEdit::new(&mut cta).arrows(false).hex(true),
-                                );
-                            });
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("CTA_L");
-                        });
-                        row.col(|ui| {
-                            let mut cta_l = cta & 0xff;
-                            ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
-                                ui.add_enabled(
-                                    false,
-                                    NumberEdit::new(&mut cta_l).arrows(false).hex(true),
-                                );
-                            });
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("CTA_R");
-                        });
-                        row.col(|ui| {
-                            let mut cta_r = (cta >> 8) & 0xff;
-                            ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
-                                ui.add_enabled(
-                                    false,
-                                    NumberEdit::new(&mut cta_r).arrows(false).hex(true),
-                                );
-                            });
-                        });
-                    });
-                });
-            ui.allocate_space(ui.available_size_before_wrap());
-        });
-    }
-
-    fn row_height(&self, ui: &mut Ui) -> f32 {
-        ui.spacing().interact_size.y + ui.style().visuals.selection.stroke.width
-    }
-
-    fn read_address<T: MemoryValue>(&self, address: usize) -> T {
-        read_address(&self.registers.borrow(), address)
-    }
-}
-
-fn read_address<T: MemoryValue>(registers: &MemoryRef, address: usize) -> T {
-    let index = (address - 0x0005f800) / size_of::<T>();
-    registers.read(index)
-}
-
-impl AppWindow for RegisterWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of(format!("registers-{}", self.sim_id))
-    }
-
-    fn sim_id(&self) -> SimId {
-        self.sim_id
-    }
-
-    fn initial_viewport(&self) -> ViewportBuilder {
-        ViewportBuilder::default()
-            .with_title(format!("Registers ({})", self.sim_id))
-            .with_inner_size((800.0, 480.0))
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
-            ScrollArea::vertical().show(ui, |ui| {
-                ui.horizontal_top(|ui| {
-                    let width = ui.available_width();
-                    let xspace = ui.spacing().item_spacing.x;
-                    StripBuilder::new(ui)
-                        .size(Size::exact(width * 0.25 - xspace))
-                        .size(Size::exact(width * 0.225 - xspace))
-                        .size(Size::exact(width * 0.325 - xspace))
-                        .size(Size::exact(width * 0.2 - xspace))
-                        .horizontal(|mut strip| {
-                            strip.cell(|ui| {
-                                self.show_interrupts(ui);
-                            });
-                            strip.strip(|nested| {
-                                nested.sizes(Size::remainder(), 2).vertical(|mut strip| {
-                                    strip.cell(|ui| {
-                                        self.show_display_status(ui);
-                                    });
-                                    strip.cell(|ui| {
-                                        self.show_drawing_status(ui);
-                                    });
-                                });
-                            });
-                            strip.cell(|ui| {
-                                self.show_colors(ui);
-                            });
-                            strip.strip(|nested| {
-                                nested.sizes(Size::remainder(), 2).vertical(|mut strip| {
-                                    strip.cell(|ui| {
-                                        self.show_objects(ui);
-                                    });
-                                    strip.cell(|ui| {
-                                        self.show_misc(ui);
-                                    });
-                                });
-                            });
-                        });
-                });
-            });
-        });
-    }
-}
-
-struct InterruptReg {
-    timeerr: bool,
-    xpend: bool,
-    sbhit: bool,
-    framestart: bool,
-    gamestart: bool,
-    rfbend: bool,
-    lfbend: bool,
-    scanerr: bool,
-}
-
-impl InterruptReg {
-    fn parse(value: u16) -> Self {
-        Self {
-            timeerr: value & 0x8000 != 0,
-            xpend: value & 0x4000 != 0,
-            sbhit: value & 0x2000 != 0,
-            framestart: value & 0x0010 != 0,
-            gamestart: value & 0x0008 != 0,
-            rfbend: value & 0x0004 != 0,
-            lfbend: value & 0x0002 != 0,
-            scanerr: value & 0x0001 != 0,
-        }
-    }
-
-    fn update(&self, value: &mut u16) -> bool {
-        let new_value = (*value & 0x1fe0)
-            | if self.timeerr { 0x8000 } else { 0x0000 }
-            | if self.xpend { 0x4000 } else { 0x0000 }
-            | if self.sbhit { 0x2000 } else { 0x0000 }
-            | if self.framestart { 0x0010 } else { 0x0000 }
-            | if self.gamestart { 0x0008 } else { 0x0000 }
-            | if self.rfbend { 0x0004 } else { 0x0000 }
-            | if self.lfbend { 0x0002 } else { 0x0000 }
-            | if self.scanerr { 0x0001 } else { 0x0000 };
-        let changed = *value != new_value;
-        *value = new_value;
-        changed
-    }
-}
-
-struct DisplayReg {
-    lock: bool,
-    synce: bool,
-    re: bool,
-    fclk: bool,
-    scanrdy: bool,
-    r1bsy: bool,
-    l1bsy: bool,
-    r0bsy: bool,
-    l0bsy: bool,
-    disp: bool,
-    dprst: bool,
-}
-
-impl DisplayReg {
-    fn parse(value: u16) -> Self {
-        Self {
-            lock: value & 0x0400 != 0,
-            synce: value & 0x0200 != 0,
-            re: value & 0x0100 != 0,
-            fclk: value & 0x0080 != 0,
-            scanrdy: value & 0x0040 != 0,
-            r1bsy: value & 0x0020 != 0,
-            l1bsy: value & 0x0010 != 0,
-            r0bsy: value & 0x0008 != 0,
-            l0bsy: value & 0x0004 != 0,
-            disp: value & 0x0002 != 0,
-            dprst: value & 0x0001 != 0,
-        }
-    }
-
-    fn update(&self, value: &mut u16) -> bool {
-        let new_value = (*value & 0xf800)
-            | if self.lock { 0x0400 } else { 0x0000 }
-            | if self.synce { 0x0200 } else { 0x0000 }
-            | if self.re { 0x0100 } else { 0x0000 }
-            | if self.fclk { 0x0080 } else { 0x0000 }
-            | if self.scanrdy { 0x0040 } else { 0x0000 }
-            | if self.r1bsy { 0x0020 } else { 0x0000 }
-            | if self.l1bsy { 0x0010 } else { 0x0000 }
-            | if self.r0bsy { 0x0008 } else { 0x0000 }
-            | if self.l0bsy { 0x0004 } else { 0x0000 }
-            | if self.disp { 0x0002 } else { 0x0000 }
-            | if self.dprst { 0x0001 } else { 0x0000 };
-        let changed = *value != new_value;
-        *value = new_value;
-        changed
-    }
-}
-
-struct DrawingReg {
-    sbout: bool,
-    sbcount: u8,
-    overtime: bool,
-    f1bsy: bool,
-    f0bsy: bool,
-    xpen: bool,
-    xprst: bool,
-}
-
-impl DrawingReg {
-    fn parse(value: u16) -> Self {
-        Self {
-            sbout: value & 0x8000 != 0,
-            sbcount: (value >> 8) as u8 & 0x1f,
-            overtime: value & 0x0010 != 0,
-            f1bsy: value & 0x0008 != 0,
-            f0bsy: value & 0x0004 != 0,
-            xpen: value & 0x0002 != 0,
-            xprst: value & 0x0001 != 0,
-        }
-    }
-
-    fn update(&self, value: &mut u16) -> bool {
-        let new_value = (*value & 0x60e0)
-            | if self.sbout { 0x8000 } else { 0x0000 }
-            | (((self.sbcount & 0x1f) as u16) << 8)
-            | if self.overtime { 0x0010 } else { 0x0000 }
-            | if self.f1bsy { 0x0008 } else { 0x0000 }
-            | if self.f0bsy { 0x0004 } else { 0x0000 }
-            | if self.xpen { 0x0002 } else { 0x0000 }
-            | if self.xprst { 0x0001 } else { 0x0000 };
-        let changed = *value != new_value;
-        *value = new_value;
-        changed
-    }
-}

src/window/vram.rs

@@ -1,14 +1,10 @@
 mod bgmap;
 mod chardata;
-mod framebuffer;
 mod object;
-mod registers;
 mod utils;
 mod world;
 
 pub use bgmap::*;
 pub use chardata::*;
-pub use framebuffer::*;
 pub use object::*;
-pub use registers::*;
 pub use world::*;

src/window/vram/bgmap.rs

@@ -8,11 +8,11 @@ use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 
 use crate::{
     emulator::SimId,
-    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
+    vram::{VramImage, VramParams, VramProcessor, VramRenderer, VramTextureLoader},
     window::{
-        AppWindow,
         utils::{NumberEdit, UiExt},
+        AppWindow,
     },
 };
 
@@ -20,22 +20,22 @@ use super::utils::{self, CellData, CharacterGrid};
 
 pub struct BgMapWindow {
     sim_id: SimId,
-    loader: Arc<ImageTextureLoader>,
+    loader: Arc<VramTextureLoader>,
     memory: Arc<MemoryClient>,
     bgmaps: MemoryView,
     cell_index: usize,
     generic_palette: bool,
-    params: ImageParams<BgMapParams>,
+    params: VramParams<BgMapParams>,
     scale: f32,
     show_grid: bool,
 }
 
 impl BgMapWindow {
-    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
+    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, vram: &mut VramProcessor) -> Self {
         let renderer = BgMapRenderer::new(sim_id, memory);
-        let ([cell, bgmap], params) = images.add(renderer, BgMapParams::default());
+        let ([cell, bgmap], params) = vram.add(renderer, BgMapParams::default());
         let loader =
-            ImageTextureLoader::new([("vip://cell".into(), cell), ("vip://bgmap".into(), bgmap)]);
+            VramTextureLoader::new([("vram://cell".into(), cell), ("vram://bgmap".into(), bgmap)]);
         Self {
             sim_id,
             loader: Arc::new(loader),
@@ -90,7 +90,7 @@ impl BgMapWindow {
                         });
                     });
                 });
-            let image = Image::new("vip://cell")
+            let image = Image::new("vram://cell")
                 .maintain_aspect_ratio(true)
                 .texture_options(TextureOptions::NEAREST);
             ui.add(image);
@@ -162,7 +162,7 @@ impl BgMapWindow {
     }
 
     fn show_bgmap(&mut self, ui: &mut Ui) {
-        let grid = CharacterGrid::new("vip://bgmap")
+        let grid = CharacterGrid::new("vram://bgmap")
             .with_scale(self.scale)
             .with_grid(self.show_grid)
             .with_selected(self.cell_index % 4096);
@@ -195,7 +195,7 @@ impl AppWindow for BgMapWindow {
         CentralPanel::default().show(ctx, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
-                    .size(Size::relative(0.3).at_most(200.0))
+                    .size(Size::relative(0.3))
                     .size(Size::remainder())
                     .horizontal(|mut strip| {
                         strip.cell(|ui| {
@@ -233,7 +233,7 @@ impl BgMapRenderer {
         }
     }
 
-    fn render_bgmap(&self, image: &mut ImageBuffer, bgmap_index: usize, generic_palette: bool) {
+    fn render_bgmap(&self, image: &mut VramImage, bgmap_index: usize, generic_palette: bool) {
         let chardata = self.chardata.borrow();
         let bgmaps = self.bgmaps.borrow();
         let brightness = self.brightness.borrow();
@@ -266,7 +266,7 @@ impl BgMapRenderer {
         }
     }
 
-    fn render_bgmap_cell(&self, image: &mut ImageBuffer, index: usize, generic_palette: bool) {
+    fn render_bgmap_cell(&self, image: &mut VramImage, index: usize, generic_palette: bool) {
         let chardata = self.chardata.borrow();
         let bgmaps = self.bgmaps.borrow();
         let brightness = self.brightness.borrow();
@@ -297,14 +297,14 @@ impl BgMapRenderer {
     }
 }
 
-impl ImageRenderer<2> for BgMapRenderer {
+impl VramRenderer<2> for BgMapRenderer {
     type Params = BgMapParams;
 
     fn sizes(&self) -> [[usize; 2]; 2] {
         [[8, 8], [8 * 64, 8 * 64]]
     }
 
-    fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; 2]) {
+    fn render(&mut self, params: &Self::Params, images: &mut [VramImage; 2]) {
         self.render_bgmap_cell(&mut images[0], params.cell_index, params.generic_palette);
         self.render_bgmap(
             &mut images[1],

src/window/vram/chardata.rs

@@ -9,18 +9,18 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     emulator::SimId,
-    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
+    vram::{VramImage, VramParams, VramProcessor, VramRenderer, VramTextureLoader},
     window::{
-        AppWindow,
         utils::{NumberEdit, UiExt as _},
+        AppWindow,
     },
 };
 
 use super::utils::{self, CharacterGrid};
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub enum Palette {
+pub enum VramPalette {
     #[default]
     Generic,
     Bg0,
@@ -33,8 +33,8 @@ pub enum Palette {
     Obj3,
 }
 
-impl Palette {
+impl VramPalette {
-    pub const fn values() -> [Palette; 9] {
+    pub const fn values() -> [VramPalette; 9] {
         [
             Self::Generic,
             Self::Bg0,
@@ -63,7 +63,7 @@ impl Palette {
     }
 }
 
-impl Display for Palette {
+impl Display for VramPalette {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Self::Generic => f.write_str("Generic"),
@@ -81,23 +81,23 @@ impl Display for Palette {
 
 pub struct CharacterDataWindow {
     sim_id: SimId,
-    loader: Arc<ImageTextureLoader>,
+    loader: Arc<VramTextureLoader>,
     brightness: MemoryView,
     palettes: MemoryView,
-    palette: Palette,
+    palette: VramPalette,
     index: usize,
-    params: ImageParams<CharDataParams>,
+    params: VramParams<CharDataParams>,
     scale: f32,
     show_grid: bool,
 }
 
 impl CharacterDataWindow {
-    pub fn new(sim_id: SimId, memory: &MemoryClient, images: &mut ImageProcessor) -> Self {
+    pub fn new(sim_id: SimId, memory: &MemoryClient, vram: &mut VramProcessor) -> Self {
         let renderer = CharDataRenderer::new(sim_id, memory);
-        let ([char, chardata], params) = images.add(renderer, CharDataParams::default());
+        let ([char, chardata], params) = vram.add(renderer, CharDataParams::default());
-        let loader = ImageTextureLoader::new([
+        let loader = VramTextureLoader::new([
-            ("vip://char".into(), char),
+            ("vram://char".into(), char),
-            ("vip://chardata".into(), chardata),
+            ("vram://chardata".into(), chardata),
         ]);
         Self {
             sim_id,
@@ -160,7 +160,7 @@ impl CharacterDataWindow {
                         });
                     });
                 });
-            let image = Image::new("vip://char")
+            let image = Image::new("vram://char")
                 .maintain_aspect_ratio(true)
                 .texture_options(TextureOptions::NEAREST);
             ui.add(image);
@@ -171,7 +171,7 @@ impl CharacterDataWindow {
                         .selected_text(self.palette.to_string())
                         .width(ui.available_width())
                         .show_ui(ui, |ui| {
-                            for palette in Palette::values() {
+                            for palette in VramPalette::values() {
                                 ui.selectable_value(
                                     &mut self.palette,
                                     palette,
@@ -226,7 +226,7 @@ impl CharacterDataWindow {
     }
 
     fn show_chardata(&mut self, ui: &mut Ui) {
-        let grid = CharacterGrid::new("vip://chardata")
+        let grid = CharacterGrid::new("vram://chardata")
             .with_scale(self.scale)
             .with_grid(self.show_grid)
             .with_selected(self.index);
@@ -259,7 +259,7 @@ impl AppWindow for CharacterDataWindow {
         CentralPanel::default().show(ctx, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
-                    .size(Size::relative(0.3).at_most(200.0))
+                    .size(Size::relative(0.3))
                     .size(Size::remainder())
                     .horizontal(|mut strip| {
                         strip.cell(|ui| {
@@ -276,13 +276,13 @@ impl AppWindow for CharacterDataWindow {
 
 #[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Hash)]
 enum CharDataResource {
-    Character { palette: Palette, index: usize },
+    Character { palette: VramPalette, index: usize },
-    CharacterData { palette: Palette },
+    CharacterData { palette: VramPalette },
 }
 
 #[derive(Clone, Default, PartialEq, Eq)]
 struct CharDataParams {
-    palette: Palette,
+    palette: VramPalette,
     index: usize,
 }
 
@@ -292,14 +292,14 @@ struct CharDataRenderer {
     palettes: MemoryView,
 }
 
-impl ImageRenderer<2> for CharDataRenderer {
+impl VramRenderer<2> for CharDataRenderer {
     type Params = CharDataParams;
 
     fn sizes(&self) -> [[usize; 2]; 2] {
         [[8, 8], [16 * 8, 128 * 8]]
     }
 
-    fn render(&mut self, params: &Self::Params, image: &mut [ImageBuffer; 2]) {
+    fn render(&mut self, params: &Self::Params, image: &mut [VramImage; 2]) {
         self.render_character(&mut image[0], params.palette, params.index);
         self.render_character_data(&mut image[1], params.palette);
     }
@@ -314,7 +314,7 @@ impl CharDataRenderer {
         }
     }
 
-    fn render_character(&self, image: &mut ImageBuffer, palette: Palette, index: usize) {
+    fn render_character(&self, image: &mut VramImage, palette: VramPalette, index: usize) {
         if index >= 2048 {
             return;
         }
@@ -329,7 +329,7 @@ impl CharDataRenderer {
         }
     }
 
-    fn render_character_data(&self, image: &mut ImageBuffer, palette: Palette) {
+    fn render_character_data(&self, image: &mut VramImage, palette: VramPalette) {
         let palette = self.load_palette(palette);
         let chardata = self.chardata.borrow();
         for (row, pixels) in chardata.range::<u16>(0, 8 * 2048).enumerate() {
@@ -344,7 +344,7 @@ impl CharDataRenderer {
         }
     }
 
-    fn load_palette(&self, palette: Palette) -> [Color32; 4] {
+    fn load_palette(&self, palette: VramPalette) -> [Color32; 4] {
         let Some(offset) = palette.offset() else {
             return utils::GENERIC_PALETTE.map(|p| utils::shade(p, Color32::RED));
         };

src/window/vram/object.rs

@@ -8,11 +8,11 @@ use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 
 use crate::{
     emulator::SimId,
-    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
+    vram::{VramImage, VramParams, VramProcessor, VramRenderer, VramTextureLoader},
     window::{
-        AppWindow,
         utils::{NumberEdit, UiExt as _},
+        AppWindow,
     },
 };
 
@@ -20,17 +20,17 @@ use super::utils::{self, Object};
 
 pub struct ObjectWindow {
     sim_id: SimId,
-    loader: Arc<ImageTextureLoader>,
+    loader: Arc<VramTextureLoader>,
     memory: Arc<MemoryClient>,
     objects: MemoryView,
     index: usize,
     generic_palette: bool,
-    params: ImageParams<ObjectParams>,
+    params: VramParams<ObjectParams>,
     scale: f32,
 }
 
 impl ObjectWindow {
-    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
+    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, vram: &mut VramProcessor) -> Self {
         let initial_params = ObjectParams {
             index: 0,
             generic_palette: false,
@@ -38,9 +38,9 @@ impl ObjectWindow {
             right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
         };
         let renderer = ObjectRenderer::new(sim_id, memory);
-        let ([zoom, full], params) = images.add(renderer, initial_params);
+        let ([zoom, full], params) = vram.add(renderer, initial_params);
         let loader =
-            ImageTextureLoader::new([("vip://zoom".into(), zoom), ("vip://full".into(), full)]);
+            VramTextureLoader::new([("vram://zoom".into(), zoom), ("vram://full".into(), full)]);
         Self {
             sim_id,
             loader: Arc::new(loader),
@@ -82,7 +82,7 @@ impl ObjectWindow {
                         });
                     });
                 });
-            let image = Image::new("vip://zoom")
+            let image = Image::new("vram://zoom")
                 .maintain_aspect_ratio(true)
                 .texture_options(TextureOptions::NEAREST);
             ui.add(image);
@@ -186,7 +186,7 @@ impl ObjectWindow {
     }
 
     fn show_object(&mut self, ui: &mut Ui) {
-        let image = Image::new("vip://full")
+        let image = Image::new("vram://full")
             .fit_to_original_size(self.scale)
             .texture_options(TextureOptions::NEAREST);
         ui.add(image);
@@ -216,7 +216,7 @@ impl AppWindow for ObjectWindow {
         CentralPanel::default().show(ctx, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
-                    .size(Size::relative(0.3).at_most(200.0))
+                    .size(Size::relative(0.3))
                     .size(Size::remainder())
                     .horizontal(|mut strip| {
                         strip.cell(|ui| {
@@ -261,13 +261,7 @@ impl ObjectRenderer {
         }
     }
 
-    fn render_object(
+    fn render_object(&self, image: &mut VramImage, params: &ObjectParams, use_pos: bool, eye: Eye) {
-        &self,
-        image: &mut ImageBuffer,
-        params: &ObjectParams,
-        use_pos: bool,
-        eye: Eye,
-    ) {
         let chardata = self.chardata.borrow();
         let objects = self.objects.borrow();
         let brightness = self.brightness.borrow();
@@ -324,14 +318,14 @@ impl ObjectRenderer {
     }
 }
 
-impl ImageRenderer<2> for ObjectRenderer {
+impl VramRenderer<2> for ObjectRenderer {
     type Params = ObjectParams;
 
     fn sizes(&self) -> [[usize; 2]; 2] {
         [[8, 8], [384, 224]]
     }
 
-    fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; 2]) {
+    fn render(&mut self, params: &Self::Params, images: &mut [VramImage; 2]) {
         images[0].clear();
         self.render_object(&mut images[0], params, false, Eye::Left);
         self.render_object(&mut images[0], params, false, Eye::Right);

src/window/vram/utils.rs

@@ -1,14 +1,9 @@
 use egui::{Color32, Image, ImageSource, Response, Sense, TextureOptions, Ui, Widget};
 
-pub const GENERIC_PALETTE: [u8; 4] = [0, 32, 64, 128];
+pub const GENERIC_PALETTE: [u8; 4] = [0, 64, 128, 255];
 
 pub fn shade(brt: u8, color: Color32) -> Color32 {
-    let corrected = if brt > 132 {
+    color.gamma_multiply(brt as f32 / 255.0)
-        255.0
-    } else {
-        (brt as f32 * 255.0 / 133.0).round()
-    };
-    color.gamma_multiply(corrected / 255.0)
 }
 
 pub fn generic_palette(color: Color32) -> [Color32; 4] {
@@ -33,15 +28,6 @@ pub const fn parse_shades(brts: &[u8; 8]) -> [u8; 4] {
     ]
 }
 
-pub fn parse_brts(brts: &[u16; 3], color: Color32) -> [Color32; 4] {
-    [
-        Color32::BLACK,
-        shade(brts[0] as u8, color),
-        shade(brts[1] as u8, color),
-        shade((brts[0] + brts[1] + brts[2]) as u8, color),
-    ]
-}
-
 pub fn palette_colors(palette: u8, brts: &[u8; 8], color: Color32) -> [Color32; 4] {
     let colors = parse_shades(brts).map(|s| shade(s, color));
     parse_palette(palette).map(|p| colors[p as usize])
@@ -124,7 +110,7 @@ impl CellData {
     }
 
     pub fn update(&self, source: &mut u16) -> bool {
-        let new_value = ((self.palette_index as u16) << 14)
+        let new_value = (self.palette_index as u16) << 14
             | if self.hflip { 0x2000 } else { 0x0000 }
             | if self.vflip { 0x1000 } else { 0x0000 }
             | (self.char_index as u16 & 0x07ff)
@@ -222,12 +208,12 @@ impl Widget for CharacterGrid<'_> {
             for x in (1..grid_width_cells).map(|i| (i as f32) * cell_size) {
                 let p1 = (res.rect.min.x + x, res.rect.min.y).into();
                 let p2 = (res.rect.min.x + x, res.rect.max.y).into();
-                painter.line_segment([p1, p2], stroke);
+                painter.line(vec![p1, p2], stroke);
             }
             for y in (1..grid_height_cells).map(|i| (i as f32) * cell_size) {
                 let p1 = (res.rect.min.x, res.rect.min.y + y).into();
                 let p2 = (res.rect.max.x, res.rect.min.y + y).into();
-                painter.line_segment([p1, p2], stroke);
+                painter.line(vec![p1, p2], stroke);
             }
         }
         if let Some(selected) = self.selected {

src/window/vram/world.rs

@@ -5,41 +5,33 @@ use egui::{
     TextureOptions, Ui, ViewportBuilder, ViewportId,
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
-use fixed::{
-    FixedI32,
-    types::extra::{U3, U9},
-};
 use num_derive::{FromPrimitive, ToPrimitive};
-use num_traits::{FromPrimitive, ToPrimitive};
+use num_traits::FromPrimitive;
 
 use crate::{
     emulator::SimId,
-    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryRef, MemoryView},
+    vram::{VramImage, VramParams, VramProcessor, VramRenderer, VramTextureLoader},
     window::{
-        AppWindow,
         utils::{NumberEdit, UiExt as _},
+        AppWindow,
     },
 };
 
-use super::utils::{self, CellData, Object, shade};
+use super::utils::{self, shade, CellData, Object};
 
 pub struct WorldWindow {
     sim_id: SimId,
-    loader: Arc<ImageTextureLoader>,
+    loader: Arc<VramTextureLoader>,
-    memory: Arc<MemoryClient>,
     worlds: MemoryView,
-    bgmaps: MemoryView,
     index: usize,
-    param_index: usize,
     generic_palette: bool,
-    show_extents: bool,
+    params: VramParams<WorldParams>,
-    params: ImageParams<WorldParams>,
     scale: f32,
 }
 
 impl WorldWindow {
-    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
+    pub fn new(sim_id: SimId, memory: &MemoryClient, vram: &mut VramProcessor) -> Self {
         let initial_params = WorldParams {
             index: 31,
             generic_palette: false,
@@ -47,18 +39,14 @@ impl WorldWindow {
             right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
         };
         let renderer = WorldRenderer::new(sim_id, memory);
-        let ([world], params) = images.add(renderer, initial_params);
+        let ([world], params) = vram.add(renderer, initial_params);
-        let loader = ImageTextureLoader::new([("vip://world".into(), world)]);
+        let loader = VramTextureLoader::new([("vram://world".into(), world)]);
         Self {
             sim_id,
             loader: Arc::new(loader),
-            memory: memory.clone(),
+            worlds: memory.watch(sim_id, 0x3d800, 0x400),
-            worlds: memory.watch(sim_id, 0x0003d800, 0x400),
-            bgmaps: memory.watch(sim_id, 0x00020000, 0x20000),
             index: params.index,
-            param_index: 0,
             generic_palette: params.generic_palette,
-            show_extents: false,
             params,
             scale: 1.0,
         }
@@ -84,7 +72,7 @@ impl WorldWindow {
                             ui.label("Address");
                         });
                         row.col(|ui| {
-                            let address = 0x0003d800 + self.index * 32;
+                            let address = 0x3d800 + self.index * 32;
                             let mut address_str = format!("{address:08x}");
                             ui.add_enabled(
                                 false,
@@ -93,7 +81,7 @@ impl WorldWindow {
                         });
                     });
                 });
-            let mut data = {
+            let data = {
                 let worlds = self.worlds.borrow();
                 worlds.read(self.index)
             };
@@ -274,137 +262,6 @@ impl WorldWindow {
                         });
                     });
             });
-            if world.update(&mut data) {
-                let address = 0x0003d800 + self.index * 32;
-                self.memory.write(self.sim_id, address as u32, &data);
-            }
-            if world.header.mode == WorldMode::HBias {
-                ui.section("H-bias", |ui| {
-                    TableBuilder::new(ui)
-                        .column(Column::remainder())
-                        .column(Column::remainder())
-                        .body(|mut body| {
-                            body.row(row_height, |mut row| {
-                                row.col(|ui| {
-                                    ui.label("Index");
-                                });
-                                row.col(|ui| {
-                                    let max = world.height.max(8) as usize;
-                                    ui.add(NumberEdit::new(&mut self.param_index).range(0..max));
-                                });
-                            });
-                            let base = (world.param_base + self.param_index * 2) & 0x1ffff;
-                            let mut param = HBiasParam::load(&self.bgmaps.borrow(), base);
-                            body.row(row_height, |mut row| {
-                                row.col(|ui| {
-                                    ui.label("Address");
-                                });
-                                row.col(|ui| {
-                                    let address = 0x00020000 + base * 2;
-                                    let mut address_str = format!("{address:08x}");
-                                    ui.add_enabled(
-                                        false,
-                                        TextEdit::singleline(&mut address_str)
-                                            .horizontal_align(Align::Max),
-                                    );
-                                });
-                            });
-                            body.row(row_height, |mut row| {
-                                row.col(|ui| {
-                                    ui.label("Left");
-                                });
-                                row.col(|ui| {
-                                    ui.add(NumberEdit::new(&mut param.left).range(-4096..4096));
-                                });
-                            });
-                            body.row(row_height, |mut row| {
-                                row.col(|ui| {
-                                    ui.label("Right");
-                                });
-                                row.col(|ui| {
-                                    ui.add(NumberEdit::new(&mut param.right).range(-4096..4096));
-                                });
-                            });
-                            param.save(&self.memory, self.sim_id, base);
-                        });
-                });
-            } else if world.header.mode == WorldMode::Affine {
-                ui.section("Affine", |ui| {
-                    TableBuilder::new(ui)
-                        .column(Column::remainder())
-                        .column(Column::remainder())
-                        .body(|mut body| {
-                            body.row(row_height, |mut row| {
-                                row.col(|ui| {
-                                    ui.label("Index");
-                                });
-                                row.col(|ui| {
-                                    let max = world.height.max(1) as usize;
-                                    ui.add(NumberEdit::new(&mut self.param_index).range(0..max));
-                                });
-                            });
-                            let base = (world.param_base + self.param_index * 8) & 0x1ffff;
-                            let mut param = AffineParam::load(&self.bgmaps.borrow(), base);
-                            body.row(row_height, |mut row| {
-                                row.col(|ui| {
-                                    ui.label("Address");
-                                });
-                                row.col(|ui| {
-                                    let address = 0x00020000 + base * 2;
-                                    let mut address_str = format!("{address:08x}");
-                                    ui.add_enabled(
-                                        false,
-                                        TextEdit::singleline(&mut address_str)
-                                            .horizontal_align(Align::Max),
-                                    );
-                                });
-                            });
-                            body.row(row_height, |mut row| {
-                                row.col(|ui| {
-                                    ui.label("Src X");
-                                });
-                                row.col(|ui| {
-                                    ui.add(NumberEdit::new(&mut param.src_x).precision(3));
-                                });
-                            });
-                            body.row(row_height, |mut row| {
-                                row.col(|ui| {
-                                    ui.label("Src Y");
-                                });
-                                row.col(|ui| {
-                                    ui.add(NumberEdit::new(&mut param.src_y).precision(3));
-                                });
-                            });
-                            body.row(row_height, |mut row| {
-                                row.col(|ui| {
-                                    ui.label("Src parallax");
-                                });
-                                row.col(|ui| {
-                                    ui.add(NumberEdit::new(&mut param.src_parallax));
-                                });
-                            });
-                            body.row(row_height, |mut row| {
-                                row.col(|ui| {
-                                    ui.label("Delta X");
-                                });
-                                row.col(|ui| {
-                                    ui.add(NumberEdit::new(&mut param.dx).precision(9));
-                                });
-                            });
-                            body.row(row_height, |mut row| {
-                                row.col(|ui| {
-                                    ui.label("Delta Y");
-                                });
-                                row.col(|ui| {
-                                    ui.add(NumberEdit::new(&mut param.dy).precision(9));
-                                });
-                            });
-                            param.save(&self.memory, self.sim_id, base);
-                        });
-                });
-            } else {
-                self.param_index = 0;
-            }
             ui.section("Display", |ui| {
                 ui.horizontal(|ui| {
                     ui.label("Scale");
@@ -415,7 +272,6 @@ impl WorldWindow {
                     ui.add(slider);
                 });
                 ui.checkbox(&mut self.generic_palette, "Generic palette");
-                ui.checkbox(&mut self.show_extents, "Show extents");
             });
         });
         self.params.write(WorldParams {
@@ -426,85 +282,10 @@ impl WorldWindow {
     }
 
     fn show_world(&mut self, ui: &mut Ui) {
-        let image = Image::new("vip://world")
+        let image = Image::new("vram://world")
             .fit_to_original_size(self.scale)
             .texture_options(TextureOptions::NEAREST);
-        let res = ui.add(image);
+        ui.add(image);
-        if self.show_extents {
-            let world = {
-                let worlds = self.worlds.borrow();
-                let data = worlds.read(self.index);
-                World::parse(&data)
-            };
-            if world.header.mode == WorldMode::Object {
-                return;
-            }
-
-            let lx1 = (world.dst_x - world.dst_parallax) as f32 * self.scale;
-            let lx2 = lx1 + world.width as f32 * self.scale;
-            let rx1 = (world.dst_x + world.dst_parallax) as f32 * self.scale;
-            let rx2 = rx1 + world.width as f32 * self.scale;
-            let y1 = world.dst_y as f32 * self.scale;
-            let y2 = y1 + world.height as f32 * self.scale;
-
-            let left_color = self.params.left_color;
-            let right_color = self.params.right_color;
-            let both_color = Color32::from_rgb(
-                left_color.r() + right_color.r(),
-                left_color.g() + right_color.g(),
-                left_color.b() + right_color.b(),
-            );
-
-            let painter = ui.painter();
-            let draw_rect = |x1: f32, x2: f32, color: Color32| {
-                painter.line(
-                    vec![
-                        res.rect.min + (x1, y1).into(),
-                        res.rect.min + (x2, y1).into(),
-                        res.rect.min + (x2, y2).into(),
-                        res.rect.min + (x1, y2).into(),
-                        res.rect.min + (x1, y1).into(),
-                    ],
-                    (2.0, color),
-                )
-            };
-
-            match (world.header.lon, world.header.ron) {
-                (false, false) => {}
-                (true, false) => {
-                    draw_rect(lx1, lx2, left_color);
-                }
-                (false, true) => {
-                    draw_rect(rx1, rx2, right_color);
-                }
-                (true, true) if world.dst_parallax == 0 => {
-                    draw_rect(lx1, lx2, both_color);
-                }
-                (true, true) => {
-                    draw_rect(lx1, lx2, left_color);
-                    draw_rect(rx1, rx2, right_color);
-                    let (x1, x2) = if world.dst_parallax < 0 {
-                        (lx1, rx2)
-                    } else {
-                        (rx1, lx2)
-                    };
-                    painter.line_segment(
-                        [
-                            res.rect.min + (x1, y1).into(),
-                            res.rect.min + (x2 + 1.0, y1).into(),
-                        ],
-                        (2.0, both_color),
-                    );
-                    painter.line_segment(
-                        [
-                            res.rect.min + (x1, y2).into(),
-                            res.rect.min + (x2 + 1.0, y2).into(),
-                        ],
-                        (2.0, both_color),
-                    );
-                }
-            }
-        }
     }
 }
 
@@ -520,7 +301,7 @@ impl AppWindow for WorldWindow {
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
             .with_title(format!("Worlds ({})", self.sim_id))
-            .with_inner_size((640.0, 520.0))
+            .with_inner_size((640.0, 480.0))
     }
 
     fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
@@ -531,7 +312,7 @@ impl AppWindow for WorldWindow {
         CentralPanel::default().show(ctx, |ui| {
             ui.horizontal_top(|ui| {
                 StripBuilder::new(ui)
-                    .size(Size::relative(0.3).at_most(200.0))
+                    .size(Size::relative(0.3))
                     .size(Size::remainder())
                     .horizontal(|mut strip| {
                         strip.cell(|ui| {
@@ -585,7 +366,7 @@ impl WorldRenderer {
         }
     }
 
-    fn render_object_world(&mut self, group: usize, params: &WorldParams, image: &mut ImageBuffer) {
+    fn render_object_world(&mut self, group: usize, params: &WorldParams, image: &mut VramImage) {
         for cell in self.buffer.iter_mut() {
             *cell = [0, 0];
         }
@@ -682,15 +463,9 @@ impl WorldRenderer {
         }
     }
 
-    fn render_world(&mut self, world: World, params: &WorldParams, image: &mut ImageBuffer) {
+    fn render_world(&mut self, world: World, params: &WorldParams, image: &mut VramImage) {
         image.clear();
 
-        let width = if world.header.mode == WorldMode::Affine {
-            world.width & 0x03ff
-        } else {
-            world.width
-        };
-
         let height = if world.header.mode == WorldMode::Affine {
             world.height.max(8)
         } else {
@@ -698,7 +473,7 @@ impl WorldRenderer {
         };
 
         let dx1 = world.dst_x;
-        let dx2 = dx1 + width;
+        let dx2 = dx1 + world.width;
         if dx1 - world.dst_parallax > 384 || dx2 + world.dst_parallax < 0 {
             return;
         }
@@ -721,74 +496,67 @@ impl WorldRenderer {
                 shades.map(|s| shade(s, params.right_color)),
             ]
         };
-        let palettes = {
-            let palettes = self.palettes.borrow().read::<[u8; 8]>(0);
-            [
-                utils::parse_palette(palettes[0]),
-                utils::parse_palette(palettes[2]),
-                utils::parse_palette(palettes[4]),
-                utils::parse_palette(palettes[6]),
-            ]
-        };
 
-        let chardata = self.chardata.borrow();
+        let mut chars = CharCache::new(self.chardata.borrow());
-        let bgmaps = self.bgmaps.borrow();
+        let mut cells = CellCache::new(self.bgmaps.borrow());
-        let mut chars = [CharCache::new(&chardata), CharCache::new(&chardata)];
-        let mut cells = [CellCache::new(&bgmaps), CellCache::new(&bgmaps)];
-        let mut source = SourceCoordCalculator::new(&bgmaps, &world);
 
         for y in 0..height {
             let dy = y + world.dst_y;
             if !(0..224).contains(&dy) {
                 continue;
             }
+            let sy = y + world.src_y;
 
-            for x in 0..width {
+            // left side
+            for x in 0..world.width {
                 let dx = x + world.dst_x - world.dst_parallax;
-                if world.header.lon && (0..384).contains(&dx) {
+                if !(0..384).contains(&dx) {
-                    let (sx, sy) = source.left(x, y);
+                    continue;
+                }
+                let sx = x + world.src_x - world.src_parallax;
 
                 let cell_index = world.source_cell(sx, sy);
-                    let cell = cells[0].get(cell_index);
+                let cell = cells.get(cell_index);
-                    let char = chars[0].get(cell.char_index);
+                let char = chars.get(cell.char_index);
                 let row = (sy & 0x7) as usize;
                 let col = (sx & 0x7) as usize;
                 let pixel = utils::read_char_pixel(char, cell.hflip, cell.vflip, row, col);
-                    let shade = palettes[cell.palette_index][pixel as usize];
+                image.add((dx as usize, dy as usize), colors[0][pixel as usize]);
-                    image.add((dx as usize, dy as usize), colors[0][shade as usize]);
             }
 
+            // right side
+            for x in 0..world.width {
                 let dx = x + world.dst_x + world.dst_parallax;
-                if world.header.ron && (0..384).contains(&dx) {
+                if !(0..384).contains(&dx) {
-                    let (sx, sy) = source.right(x, y);
+                    continue;
+                }
+                let sx = x + world.src_x + world.src_parallax;
 
                 let cell_index = world.source_cell(sx, sy);
-                    let cell = cells[1].get(cell_index);
+                let cell = cells.get(cell_index);
-                    let char = chars[1].get(cell.char_index);
+                let char = chars.get(cell.char_index);
                 let row = (sy & 0x7) as usize;
                 let col = (sx & 0x7) as usize;
                 let pixel = utils::read_char_pixel(char, cell.hflip, cell.vflip, row, col);
-                    let shade = palettes[cell.palette_index][pixel as usize];
+                image.add((dx as usize, dy as usize), colors[1][pixel as usize]);
-                    image.add((dx as usize, dy as usize), colors[1][shade as usize]);
-                }
             }
         }
     }
 }
 
-impl ImageRenderer<1> for WorldRenderer {
+impl VramRenderer<1> for WorldRenderer {
     type Params = WorldParams;
 
     fn sizes(&self) -> [[usize; 2]; 1] {
         [[384, 224]]
     }
 
-    fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; 1]) {
+    fn render(&mut self, params: &Self::Params, images: &mut [VramImage; 1]) {
         let image = &mut images[0];
 
         let worlds = self.worlds.borrow();
         let header = WorldHeader::parse(worlds.read(params.index * 16));
-        if header.end || (!header.lon && !header.ron) {
+        if header.end || (!header.lon && header.ron) {
             image.clear();
             return;
         }
@@ -842,52 +610,6 @@ impl World {
         }
     }
 
-    fn update(&self, source: &mut [u16; 16]) -> bool {
-        let mut changed = self.header.update(&mut source[0]);
-
-        let new_dst_x = (self.dst_x as u16 & 0x03ff) | (source[1] & 0xfc00);
-        changed |= source[1] != new_dst_x;
-        source[1] = new_dst_x;
-
-        let new_dst_parallax = (self.dst_parallax as u16 & 0x03ff) | (source[2] & 0xfc00);
-        changed |= source[2] != new_dst_parallax;
-        source[2] = new_dst_parallax;
-
-        let new_dst_y = self.dst_y as u16;
-        changed |= source[3] != new_dst_y;
-        source[3] = new_dst_y;
-
-        let new_src_x = (self.src_x as u16 & 0x1fff) | (source[4] & 0xe000);
-        changed |= source[4] != new_src_x;
-        source[4] = new_src_x;
-
-        let new_src_parallax = (self.src_parallax as u16 & 0x7fff) | (source[4] & 0x8000);
-        changed |= source[5] != new_src_parallax;
-        source[5] = new_src_parallax;
-
-        let new_src_y = (self.src_y as u16 & 0x1fff) | (source[6] & 0xe000);
-        changed |= source[6] != new_src_y;
-        source[6] = new_src_y;
-
-        let new_width = ((self.width - 1) as u16 & 0x1fff) | (source[7] & 0xe000);
-        changed |= source[7] != new_width;
-        source[7] = new_width;
-
-        let new_height = (self.height - 1) as u16;
-        changed |= source[8] != new_height;
-        source[8] = new_height;
-
-        let new_param_base = self.param_base as u16;
-        changed |= source[9] != new_param_base;
-        source[9] = new_param_base;
-
-        let new_overplane = self.overplane as u16;
-        changed |= source[10] != new_overplane;
-        source[10] = new_overplane;
-
-        changed
-    }
-
     fn source_cell(&self, sx: i16, sy: i16) -> usize {
         if self.header.over {
             let bg_width = 1 << self.header.scx << 9;
@@ -943,21 +665,6 @@ impl WorldHeader {
             base,
         }
     }
-
-    fn update(&self, source: &mut u16) -> bool {
-        let new_value = (*source & 0x0030)
-            | if self.lon { 0x8000 } else { 0x0000 }
-            | if self.ron { 0x4000 } else { 0x0000 }
-            | (self.mode.to_u16().unwrap() << 12)
-            | ((self.scx as u16) << 10)
-            | ((self.scy as u16) << 8)
-            | if self.over { 0x0080 } else { 0x0000 }
-            | if self.end { 0x0040 } else { 0x0000 }
-            | (self.base as u16 & 0x000f);
-        let changed = *source != new_value;
-        *source = new_value;
-        changed
-    }
 }
 
 #[derive(Clone, Copy, PartialEq, Eq, FromPrimitive, ToPrimitive)]
@@ -986,13 +693,13 @@ impl Display for WorldMode {
 }
 
 struct CellCache<'a> {
-    bgmaps: &'a MemoryRef<'a>,
+    bgmaps: MemoryRef<'a>,
     index: usize,
     cell: CellData,
 }
 
 impl<'a> CellCache<'a> {
-    fn new(bgmaps: &'a MemoryRef<'a>) -> Self {
+    fn new(bgmaps: MemoryRef<'a>) -> Self {
         Self {
             bgmaps,
             index: 0x10000,
@@ -1011,13 +718,13 @@ impl<'a> CellCache<'a> {
 }
 
 struct CharCache<'a> {
-    chardata: &'a MemoryRef<'a>,
+    chardata: MemoryRef<'a>,
     index: usize,
     char: [u16; 8],
 }
 
 impl<'a> CharCache<'a> {
-    fn new(chardata: &'a MemoryRef<'a>) -> Self {
+    fn new(chardata: MemoryRef<'a>) -> Self {
         Self {
             chardata,
             index: 2048,
@@ -1033,189 +740,3 @@ impl<'a> CharCache<'a> {
         &self.char
     }
 }
-
-struct SourceCoordCalculator<'a> {
-    params: &'a MemoryRef<'a>,
-    world: &'a World,
-    y: i16,
-    param: SourceParam,
-}
-
-impl<'a> SourceCoordCalculator<'a> {
-    fn new(params: &'a MemoryRef<'a>, world: &'a World) -> Self {
-        Self {
-            params,
-            world,
-            y: -1,
-            param: SourceParam::Normal,
-        }
-    }
-
-    fn left(&mut self, x: i16, y: i16) -> (i16, i16) {
-        self.update_param(y);
-        match &self.param {
-            SourceParam::Normal => {
-                let sx = x + self.world.src_x - self.world.src_parallax;
-                let sy = y + self.world.src_y;
-                (sx, sy)
-            }
-            SourceParam::HBias(HBiasParam { left, .. }) => {
-                let sx = x + self.world.src_x - self.world.src_parallax + *left;
-                let sy = y + self.world.src_y;
-                (sx, sy)
-            }
-            SourceParam::Affine(affine) => {
-                let sx = affine_coord(affine.src_x, x, affine.dx, affine.src_parallax.min(0));
-                let sy = affine_coord(affine.src_y, x, affine.dy, affine.src_parallax.min(0));
-                (sx, sy)
-            }
-        }
-    }
-
-    fn right(&mut self, x: i16, y: i16) -> (i16, i16) {
-        self.update_param(y);
-        match &self.param {
-            SourceParam::Normal => {
-                let sx = x + self.world.src_x + self.world.src_parallax;
-                let sy = y + self.world.src_y;
-                (sx, sy)
-            }
-            SourceParam::HBias(HBiasParam { right, .. }) => {
-                let sx = x + self.world.src_x + self.world.src_parallax + *right;
-                let sy = y + self.world.src_y;
-                (sx, sy)
-            }
-            SourceParam::Affine(affine) => {
-                let sx = affine_coord(affine.src_x, x, affine.dx, affine.src_parallax.max(0));
-                let sy = affine_coord(affine.src_y, x, affine.dy, affine.src_parallax.max(0));
-                (sx, sy)
-            }
-        }
-    }
-
-    fn update_param(&mut self, y: i16) {
-        if self.y == y {
-            return;
-        }
-        if self.world.header.mode == WorldMode::HBias {
-            let base = self.world.param_base + (2 * y as usize);
-            self.param = SourceParam::HBias(HBiasParam::load(self.params, base));
-        }
-        if self.world.header.mode == WorldMode::Affine {
-            let base = self.world.param_base + (8 * y as usize);
-            self.param = SourceParam::Affine(AffineParam::load(self.params, base));
-        }
-        self.y = y;
-    }
-}
-
-enum SourceParam {
-    Normal,
-    HBias(HBiasParam),
-    Affine(AffineParam),
-}
-
-struct HBiasParam {
-    left: i16,
-    right: i16,
-    data: [u16; 2],
-}
-
-impl HBiasParam {
-    fn load(params: &MemoryRef, index: usize) -> Self {
-        let data = [params.read::<u16>(index), params.read::<u16>(index | 1)];
-        let left = (data[0] as i16) << 3 >> 3;
-        let right = (data[1] as i16) << 3 >> 3;
-        Self { left, right, data }
-    }
-
-    fn save(&self, memory: &MemoryClient, sim: SimId, index: usize) {
-        let new_left = (self.left as u16 & 0x1fff) | (self.data[0] & 0xe000);
-        if new_left != self.data[0] {
-            let address = 0x00020000 + (index * 2);
-            memory.write(sim, address as u32, &new_left);
-        }
-
-        let new_right = (self.right as u16 & 0x1fff) | (self.data[1] & 0xe000);
-        if new_right != self.data[1] {
-            let address = 0x00020000 + ((index | 1) * 2);
-            memory.write(sim, address as u32, &new_right);
-        }
-    }
-}
-
-struct AffineParam {
-    src_x: FixedI32<U3>,
-    src_parallax: i16,
-    src_y: FixedI32<U3>,
-    dx: FixedI32<U9>,
-    dy: FixedI32<U9>,
-    data: [u16; 5],
-}
-
-impl AffineParam {
-    fn load(params: &MemoryRef, index: usize) -> Self {
-        let data = [
-            params.read(index & 0xffff),
-            params.read((index + 1) & 0xffff),
-            params.read((index + 2) & 0xffff),
-            params.read((index + 3) & 0xffff),
-            params.read((index + 4) & 0xffff),
-        ];
-
-        let src_x = FixedI32::from_bits(data[0] as i16 as i32);
-        let src_parallax = data[1] as i16;
-        let src_y = FixedI32::from_bits(data[2] as i16 as i32);
-        let dx = FixedI32::from_bits(data[3] as i16 as i32);
-        let dy = FixedI32::from_bits(data[4] as i16 as i32);
-
-        AffineParam {
-            src_x,
-            src_parallax,
-            src_y,
-            dx,
-            dy,
-            data,
-        }
-    }
-
-    fn save(&self, memory: &MemoryClient, sim: SimId, index: usize) {
-        let new_src_x = self.src_x.to_bits() as u16;
-        if new_src_x != self.data[0] {
-            let address = 0x00020000 + 2 * (index & 0xffff);
-            memory.write(sim, address as u32, &new_src_x);
-        }
-
-        let new_src_parallax = self.src_parallax as u16;
-        if new_src_parallax != self.data[1] {
-            let address = 0x00020000 + 2 * ((index + 1) & 0xffff);
-            memory.write(sim, address as u32, &new_src_parallax);
-        }
-
-        let new_src_y = self.src_y.to_bits() as u16;
-        if new_src_y != self.data[2] {
-            let address = 0x00020000 + 2 * ((index + 2) & 0xffff);
-            memory.write(sim, address as u32, &new_src_y);
-        }
-
-        let new_dx = self.dx.to_bits() as u16;
-        if new_dx != self.data[3] {
-            let address = 0x00020000 + 2 * ((index + 3) & 0xffff);
-            memory.write(sim, address as u32, &new_dx);
-        }
-
-        let new_dy = self.dy.to_bits() as u16;
-        if new_dy != self.data[4] {
-            let address = 0x00020000 + 2 * ((index + 4) & 0xffff);
-            memory.write(sim, address as u32, &new_dy);
-        }
-    }
-}
-
-fn affine_coord(start: FixedI32<U3>, distance: i16, delta: FixedI32<U9>, parallax: i16) -> i16 {
-    let start = FixedI32::<U9>::from_num(start);
-    let distance = FixedI32::<U9>::from_num(distance);
-    let parallax = FixedI32::<U9>::from_num(parallax);
-    let coord = start + ((distance + parallax) * delta);
-    coord.to_num::<i32>() as i16
-}