Rename vram to vip internally
This commit is contained in:
+10
-10
@@ -17,10 +17,10 @@ use winit::{
|
||||
use crate::{
|
||||
controller::ControllerManager,
|
||||
emulator::{EmulatorClient, EmulatorCommand, SimId},
|
||||
images::ImageProcessor,
|
||||
input::MappingProvider,
|
||||
memory::MemoryClient,
|
||||
persistence::Persistence,
|
||||
vram::VramProcessor,
|
||||
window::{
|
||||
AboutWindow, AppWindow, BgMapWindow, CharacterDataWindow, FrameBufferWindow, GameWindow,
|
||||
GdbServerWindow, InputWindow, ObjectWindow, RegisterWindow, WorldWindow,
|
||||
@@ -46,7 +46,7 @@ pub struct Application {
|
||||
mappings: MappingProvider,
|
||||
controllers: ControllerManager,
|
||||
memory: Arc<MemoryClient>,
|
||||
vram: VramProcessor,
|
||||
images: ImageProcessor,
|
||||
persistence: Persistence,
|
||||
viewports: HashMap<ViewportId, Viewport>,
|
||||
focused: Option<ViewportId>,
|
||||
@@ -65,7 +65,7 @@ impl Application {
|
||||
let mappings = MappingProvider::new(persistence.clone());
|
||||
let controllers = ControllerManager::new(client.clone(), &mappings);
|
||||
let memory = Arc::new(MemoryClient::new(client.clone()));
|
||||
let vram = VramProcessor::new();
|
||||
let images = ImageProcessor::new();
|
||||
{
|
||||
let mappings = mappings.clone();
|
||||
let proxy = proxy.clone();
|
||||
@@ -78,7 +78,7 @@ impl Application {
|
||||
proxy,
|
||||
mappings,
|
||||
memory,
|
||||
vram,
|
||||
images,
|
||||
controllers,
|
||||
persistence,
|
||||
viewports: HashMap::new(),
|
||||
@@ -214,23 +214,23 @@ impl ApplicationHandler<UserEvent> for Application {
|
||||
self.open(event_loop, Box::new(about));
|
||||
}
|
||||
UserEvent::OpenCharacterData(sim_id) => {
|
||||
let vram = CharacterDataWindow::new(sim_id, &self.memory, &mut self.vram);
|
||||
self.open(event_loop, Box::new(vram));
|
||||
let chardata = CharacterDataWindow::new(sim_id, &self.memory, &mut self.images);
|
||||
self.open(event_loop, Box::new(chardata));
|
||||
}
|
||||
UserEvent::OpenBgMap(sim_id) => {
|
||||
let bgmap = BgMapWindow::new(sim_id, &self.memory, &mut self.vram);
|
||||
let bgmap = BgMapWindow::new(sim_id, &self.memory, &mut self.images);
|
||||
self.open(event_loop, Box::new(bgmap));
|
||||
}
|
||||
UserEvent::OpenObjects(sim_id) => {
|
||||
let objects = ObjectWindow::new(sim_id, &self.memory, &mut self.vram);
|
||||
let objects = ObjectWindow::new(sim_id, &self.memory, &mut self.images);
|
||||
self.open(event_loop, Box::new(objects));
|
||||
}
|
||||
UserEvent::OpenWorlds(sim_id) => {
|
||||
let world = WorldWindow::new(sim_id, &self.memory, &mut self.vram);
|
||||
let world = WorldWindow::new(sim_id, &self.memory, &mut self.images);
|
||||
self.open(event_loop, Box::new(world));
|
||||
}
|
||||
UserEvent::OpenFrameBuffers(sim_id) => {
|
||||
let world = FrameBufferWindow::new(sim_id, &self.memory, &mut self.vram);
|
||||
let world = FrameBufferWindow::new(sim_id, &self.memory, &mut self.images);
|
||||
self.open(event_loop, Box::new(world));
|
||||
}
|
||||
UserEvent::OpenRegisters(sim_id) => {
|
||||
|
||||
Reference in New Issue
Block a user