PVB/lemur
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Rewrite VIP tools to not mutate context

Browse Source
This commit is contained in:
SonicSwordcane
2026-03-29 22:37:46 -04:00
parent 8f6a6f86db
commit 341de60816
8 changed files with 187 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/window/vip/bgmap.rs
+10 -14
View File
@@ -8,10 +8,10 @@ use egui_extras::{Column, Size, StripBuilder, TableBuilder};
use crate::{
emulator::SimId,
images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
images::{ImageBuffer, ImageParams, ImageRenderer, ImageTextureLoader},
memory::{MemoryClient, MemoryView},
window::{
AppWindow, InitArgs,
AppWindow,
utils::{NumberEdit, UiExt},
},
};
@@ -20,7 +20,6 @@ use super::utils::{self, CellData, CharacterGrid};
pub struct BgMapWindow {
sim_id: SimId,
loader: Arc<ImageTextureLoader>,
memory: Arc<MemoryClient>,
bgmaps: MemoryView,
cell_index: usize,
@@ -31,14 +30,11 @@ pub struct BgMapWindow {
}
impl BgMapWindow {
pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &ImageTextureLoader) -> Self {
let renderer = BgMapRenderer::new(sim_id, memory);
let ([cell, bgmap], params) = images.add(renderer, BgMapParams::default());
let loader =
ImageTextureLoader::new([("vip://cell".into(), cell), ("vip://bgmap".into(), bgmap)]);
let params = images.add(sim_id, renderer, BgMapParams::default());
Self {
sim_id,
loader: Arc::new(loader),
memory: memory.clone(),
bgmaps: memory.watch(sim_id, 0x00020000, 0x20000),
cell_index: params.cell_index,
@@ -90,7 +86,7 @@ impl BgMapWindow {
});
});
});
let image = Image::new("vip://cell")
let image = Image::new(self.image_url("bgmap-cell"))
.maintain_aspect_ratio(true)
.texture_options(TextureOptions::NEAREST);
ui.add(image);
@@ -162,7 +158,7 @@ impl BgMapWindow {
}
fn show_bgmap(&mut self, ui: &mut Ui) {
let grid = CharacterGrid::new("vip://bgmap")
let grid = CharacterGrid::new(self.image_url("bgmap"))
.with_scale(self.scale)
.with_grid(self.show_grid)
.with_selected(self.cell_index % 4096);
@@ -187,10 +183,6 @@ impl AppWindow for BgMapWindow {
.with_inner_size((640.0, 480.0))
}
fn on_init(&mut self, args: InitArgs) {
args.ctx.add_texture_loader(self.loader.clone());
}
fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| {
ui.horizontal_top(|ui| {
@@ -300,6 +292,10 @@ impl BgMapRenderer {
impl ImageRenderer<2> for BgMapRenderer {
type Params = BgMapParams;
fn names(&self) -> [&str; 2] {
["bgmap-cell", "bgmap"]
}
fn sizes(&self) -> [[usize; 2]; 2] {
[[8, 8], [8 * 64, 8 * 64]]
}
src/window/vip/chardata.rs
+11 -17
View File
@@ -1,4 +1,4 @@
use std::{fmt::Display, sync::Arc};
use std::fmt::Display;
use egui::{
Align, CentralPanel, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit, TextureOptions,
@@ -9,10 +9,10 @@ use serde::{Deserialize, Serialize};
use crate::{
emulator::SimId,
images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
images::{ImageBuffer, ImageParams, ImageRenderer, ImageTextureLoader},
memory::{MemoryClient, MemoryView},
window::{
AppWindow, InitArgs,
AppWindow,
utils::{NumberEdit, UiExt as _},
},
};
@@ -81,7 +81,6 @@ impl Display for Palette {
pub struct CharacterDataWindow {
sim_id: SimId,
loader: Arc<ImageTextureLoader>,
brightness: MemoryView,
palettes: MemoryView,
palette: Palette,
@@ -92,16 +91,11 @@ pub struct CharacterDataWindow {
}
impl CharacterDataWindow {
pub fn new(sim_id: SimId, memory: &MemoryClient, images: &mut ImageProcessor) -> Self {
pub fn new(sim_id: SimId, memory: &MemoryClient, images: &ImageTextureLoader) -> Self {
let renderer = CharDataRenderer::new(sim_id, memory);
let ([char, chardata], params) = images.add(renderer, CharDataParams::default());
let loader = ImageTextureLoader::new([
("vip://char".into(), char),
("vip://chardata".into(), chardata),
]);
let params = images.add(sim_id, renderer, CharDataParams::default());
Self {
sim_id,
loader: Arc::new(loader),
brightness: memory.watch(sim_id, 0x0005f824, 8),
palettes: memory.watch(sim_id, 0x0005f860, 16),
palette: params.palette,
@@ -160,7 +154,7 @@ impl CharacterDataWindow {
});
});
});
let image = Image::new("vip://char")
let image = Image::new(self.image_url("chardata-char"))
.maintain_aspect_ratio(true)
.texture_options(TextureOptions::NEAREST);
ui.add(image);
@@ -226,7 +220,7 @@ impl CharacterDataWindow {
}
fn show_chardata(&mut self, ui: &mut Ui) {
let grid = CharacterGrid::new("vip://chardata")
let grid = CharacterGrid::new(self.image_url("chardata"))
.with_scale(self.scale)
.with_grid(self.show_grid)
.with_selected(self.index);
@@ -251,10 +245,6 @@ impl AppWindow for CharacterDataWindow {
.with_inner_size((640.0, 480.0))
}
fn on_init(&mut self, args: InitArgs) {
args.ctx.add_texture_loader(self.loader.clone());
}
fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| {
ui.horizontal_top(|ui| {
@@ -289,6 +279,10 @@ struct CharDataRenderer {
impl ImageRenderer<2> for CharDataRenderer {
type Params = CharDataParams;
fn names(&self) -> [&str; 2] {
["chardata-char", "chardata"]
}
fn sizes(&self) -> [[usize; 2]; 2] {
[[8, 8], [16 * 8, 128 * 8]]
}
src/window/vip/framebuffer.rs
+9 -14
View File
@@ -1,5 +1,3 @@
use std::sync::Arc;
use egui::{
Align, CentralPanel, Color32, Image, ScrollArea, Slider, TextEdit, TextureOptions, Ui,
ViewportBuilder, ViewportId,
@@ -8,10 +6,10 @@ use egui_extras::{Column, Size, StripBuilder, TableBuilder};
use crate::{
emulator::SimId,
images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
images::{ImageBuffer, ImageParams, ImageRenderer, ImageTextureLoader},
memory::{MemoryClient, MemoryView},
window::{
AppWindow, InitArgs,
AppWindow,
utils::{NumberEdit, UiExt as _},
},
};
@@ -20,7 +18,6 @@ use super::utils;
pub struct FrameBufferWindow {
sim_id: SimId,
loader: Arc<ImageTextureLoader>,
index: usize,
left: bool,
right: bool,
@@ -30,7 +27,7 @@ pub struct FrameBufferWindow {
}
impl FrameBufferWindow {
pub fn new(sim_id: SimId, memory: &MemoryClient, images: &mut ImageProcessor) -> Self {
pub fn new(sim_id: SimId, memory: &MemoryClient, images: &ImageTextureLoader) -> Self {
let initial_params = FrameBufferParams {
index: 0,
left: true,
@@ -40,11 +37,9 @@ impl FrameBufferWindow {
right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
};
let renderer = FrameBufferRenderer::new(sim_id, memory);
let ([buffer], params) = images.add(renderer, initial_params);
let loader = ImageTextureLoader::new([("vip://buffer".into(), buffer)]);
let params = images.add(sim_id, renderer, initial_params);
Self {
sim_id,
loader: Arc::new(loader),
index: params.index,
left: params.left,
right: params.right,
@@ -131,7 +126,7 @@ impl FrameBufferWindow {
}
fn show_buffers(&mut self, ui: &mut Ui) {
let image = Image::new("vip://buffer")
let image = Image::new(self.image_url("buffer"))
.fit_to_original_size(self.scale)
.texture_options(TextureOptions::NEAREST);
ui.add(image);
@@ -153,10 +148,6 @@ impl AppWindow for FrameBufferWindow {
.with_inner_size((640.0, 480.0))
}
fn on_init(&mut self, args: InitArgs) {
args.ctx.add_texture_loader(self.loader.clone());
}
fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| {
ui.horizontal_top(|ui| {
@@ -208,6 +199,10 @@ impl FrameBufferRenderer {
impl ImageRenderer<1> for FrameBufferRenderer {
type Params = FrameBufferParams;
fn names(&self) -> [&str; 1] {
["buffer"]
}
fn sizes(&self) -> [[usize; 2]; 1] {
[[384, 224]]
}
src/window/vip/object.rs
+8 -12
View File
@@ -8,10 +8,10 @@ use egui_extras::{Column, Size, StripBuilder, TableBuilder};
use crate::{
emulator::SimId,
images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
images::{ImageBuffer, ImageParams, ImageRenderer, ImageTextureLoader},
memory::{MemoryClient, MemoryView},
window::{
AppWindow, InitArgs,
AppWindow,
utils::{NumberEdit, UiExt as _},
},
};
@@ -20,7 +20,6 @@ use super::utils::{self, Object};
pub struct ObjectWindow {
sim_id: SimId,
loader: Arc<ImageTextureLoader>,
memory: Arc<MemoryClient>,
objects: MemoryView,
index: usize,
@@ -30,7 +29,7 @@ pub struct ObjectWindow {
}
impl ObjectWindow {
pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &ImageTextureLoader) -> Self {
let initial_params = ObjectParams {
index: 0,
generic_palette: false,
@@ -38,12 +37,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 loader =
ImageTextureLoader::new([("vip://zoom".into(), zoom), ("vip://full".into(), full)]);
let params = images.add(sim_id, renderer, initial_params);
Self {
sim_id,
loader: Arc::new(loader),
memory: memory.clone(),
objects: memory.watch(sim_id, 0x0003e000, 0x2000),
index: params.index,
@@ -208,10 +204,6 @@ impl AppWindow for ObjectWindow {
.with_inner_size((640.0, 500.0))
}
fn on_init(&mut self, args: InitArgs) {
args.ctx.add_texture_loader(self.loader.clone());
}
fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| {
ui.horizontal_top(|ui| {
@@ -327,6 +319,10 @@ impl ObjectRenderer {
impl ImageRenderer<2> for ObjectRenderer {
type Params = ObjectParams;
fn names(&self) -> [&str; 2] {
["object-zoom", "object-full"]
}
fn sizes(&self) -> [[usize; 2]; 2] {
[[8, 8], [384, 224]]
}
src/window/vip/world.rs
+9 -12
View File
@@ -14,10 +14,10 @@ use num_traits::{FromPrimitive, ToPrimitive};
use crate::{
emulator::SimId,
images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
images::{ImageBuffer, ImageParams, ImageRenderer, ImageTextureLoader},
memory::{MemoryClient, MemoryRef, MemoryView},
window::{
AppWindow, InitArgs,
AppWindow,
utils::{NumberEdit, UiExt as _},
},
};
@@ -26,7 +26,6 @@ use super::utils::{self, CellData, Object, shade};
pub struct WorldWindow {
sim_id: SimId,
loader: Arc<ImageTextureLoader>,
memory: Arc<MemoryClient>,
worlds: MemoryView,
bgmaps: MemoryView,
@@ -39,7 +38,7 @@ pub struct WorldWindow {
}
impl WorldWindow {
pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &ImageTextureLoader) -> Self {
let initial_params = WorldParams {
index: 31,
generic_palette: false,
@@ -47,11 +46,9 @@ 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 loader = ImageTextureLoader::new([("vip://world".into(), world)]);
let params = images.add(sim_id, renderer, initial_params);
Self {
sim_id,
loader: Arc::new(loader),
memory: memory.clone(),
worlds: memory.watch(sim_id, 0x0003d800, 0x400),
bgmaps: memory.watch(sim_id, 0x00020000, 0x20000),
@@ -426,7 +423,7 @@ impl WorldWindow {
}
fn show_world(&mut self, ui: &mut Ui) {
let image = Image::new("vip://world")
let image = Image::new(self.image_url("world"))
.fit_to_original_size(self.scale)
.texture_options(TextureOptions::NEAREST);
let res = ui.add(image);
@@ -523,10 +520,6 @@ impl AppWindow for WorldWindow {
.with_inner_size((640.0, 520.0))
}
fn on_init(&mut self, args: InitArgs) {
args.ctx.add_texture_loader(self.loader.clone());
}
fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| {
ui.horizontal_top(|ui| {
@@ -779,6 +772,10 @@ impl WorldRenderer {
impl ImageRenderer<1> for WorldRenderer {
type Params = WorldParams;
fn names(&self) -> [&str; 1] {
["world"]
}
fn sizes(&self) -> [[usize; 2]; 1] {
[[384, 224]]
}