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

Rerwite everything to share an egui context

Browse Source
This commit is contained in:
SonicSwordcane
2026-04-02 23:51:01 -04:00
parent 615b0ab9a1
commit f7b37caccb
16 changed files with 686 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/window/about.rs
+1 -5
View File
@@ -1,14 +1,10 @@
use egui::{CentralPanel, Image, Ui, ViewportBuilder, ViewportId};
use egui::{CentralPanel, Image, Ui, ViewportBuilder};
use super::AppWindow;
pub struct AboutWindow;
impl AppWindow for AboutWindow {
fn viewport_id(&self) -> ViewportId {
ViewportId::from_hash_of("About")
}
fn initial_viewport(&self) -> ViewportBuilder {
ViewportBuilder::default()
.with_title("About Lemur")
src/window/game.rs
+273 -58
View File
@@ -1,5 +1,7 @@
use std::{
sync::{Arc, mpsc},
collections::HashMap,
ops::{Deref, DerefMut},
sync::{Arc, Mutex, atomic::AtomicBool, mpsc},
time::Duration,
};
@@ -7,9 +9,15 @@ use crate::{
app::UserEvent,
config::{COLOR_PRESETS, SimConfig},
emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId, SimState},
input::{Command, ShortcutProvider},
images::ImageTextureLoader,
input::{Command, MappingProvider, ShortcutProvider},
memory::MemoryClient,
persistence::Persistence,
window::InitArgs,
window::{
AboutWindow, BgMapWindow, CharacterDataWindow, FrameBufferWindow, GdbServerWindow,
HotkeysWindow, InitArgs, InputWindow, ObjectWindow, ProfileWindow, RegisterWindow,
TerminalWindow, WorldWindow,
},
};
use anyhow::Context as _;
use egui::{
@@ -17,7 +25,7 @@ use egui::{
ViewportBuilder, ViewportCommand, ViewportId, Window,
};
use egui_notify::{Anchor, Toast, Toasts};
use winit::event_loop::EventLoopProxy;
use winit::{event::KeyEvent, event_loop::EventLoopProxy};
use super::{
AppWindow,
@@ -26,6 +34,7 @@ use super::{
};
pub struct GameWindow {
viewport_id: ViewportId,
client: EmulatorClient,
proxy: EventLoopProxy<UserEvent>,
persistence: Persistence,
@@ -34,17 +43,27 @@ pub struct GameWindow {
config: SimConfig,
toasts: Toasts,
screen: Option<GameScreen>,
messages: Option<mpsc::Receiver<Toast>>,
messages: mpsc::Receiver<Toast>,
message_sink: mpsc::Sender<Toast>,
color_picker: Option<ColorPickerState>,
window: Option<Arc<winit::window::Window>>,
memory: Arc<MemoryClient>,
images: Arc<ImageTextureLoader>,
mappings: MappingProvider,
children: HashMap<ViewportId, ChildWindowWrapper>,
}
impl GameWindow {
#[expect(clippy::too_many_arguments)]
pub fn new(
viewport_id: ViewportId,
client: EmulatorClient,
proxy: EventLoopProxy<UserEvent>,
persistence: Persistence,
shortcuts: ShortcutProvider,
memory: &Arc<MemoryClient>,
images: &Arc<ImageTextureLoader>,
mappings: MappingProvider,
sim_id: SimId,
) -> Self {
let config = SimConfig::load(&persistence, sim_id);
@@ -52,7 +71,9 @@ impl GameWindow {
.with_anchor(Anchor::BottomLeft)
.with_margin((10.0, 10.0).into())
.reverse(true);
let (message_sink, messages) = mpsc::channel();
Self {
viewport_id,
client,
proxy,
persistence,
@@ -61,9 +82,135 @@ impl GameWindow {
config,
toasts,
screen: None,
messages: None,
messages,
message_sink,
color_picker: None,
window: None,
memory: memory.clone(),
images: images.clone(),
mappings: mappings.clone(),
children: HashMap::new(),
}
}
pub fn open(&mut self, window: ChildWindow) {
let viewport_id = window.viewport_id(self.sim_id);
if self.children.contains_key(&viewport_id) {
return;
}
let child = match window {
ChildWindow::About => AppWrapper::of_dyn(AboutWindow),
ChildWindow::CharacterData => AppWrapper::of_dyn(CharacterDataWindow::new(
self.sim_id,
&self.memory,
&self.images,
)),
ChildWindow::BgMap => {
AppWrapper::of_dyn(BgMapWindow::new(self.sim_id, &self.memory, &self.images))
}
ChildWindow::Objects => {
AppWrapper::of_dyn(ObjectWindow::new(self.sim_id, &self.memory, &self.images))
}
ChildWindow::Worlds => {
AppWrapper::of_dyn(WorldWindow::new(self.sim_id, &self.memory, &self.images))
}
ChildWindow::FrameBuffers => AppWrapper::of_dyn(FrameBufferWindow::new(
self.sim_id,
&self.memory,
&self.images,
)),
ChildWindow::Registers => {
AppWrapper::of_dyn(RegisterWindow::new(self.sim_id, &self.memory))
}
ChildWindow::Terminal => {
AppWrapper::of_dyn(TerminalWindow::new(self.sim_id, &self.client))
}
ChildWindow::Profiler { launch } => {
let mut profile = ProfileWindow::new(self.sim_id, self.client.clone());
if launch {
profile.launch();
}
AppWrapper::of_dyn(profile)
}
ChildWindow::Debugger { port } => {
let mut debugger =
GdbServerWindow::new(self.sim_id, self.client.clone(), self.proxy.clone());
if let Some(port) = port {
debugger.launch(port);
}
AppWrapper::of_dyn(debugger)
}
ChildWindow::Input => AppWrapper::of_dyn(InputWindow::new(self.mappings.clone())),
ChildWindow::Hotkeys => AppWrapper::of_dyn(HotkeysWindow::new(self.shortcuts.clone())),
ChildWindow::Player2 => {
if self.sim_id == SimId::Player2 {
return;
}
AppWrapper::of_game(GameWindow::new(
viewport_id,
self.client.clone(),
self.proxy.clone(),
self.persistence.clone(),
self.shortcuts.clone(),
&self.memory,
&self.images,
self.mappings.clone(),
SimId::Player2,
))
}
};
let viewport = child.initial_viewport();
self.children.insert(
viewport_id,
ChildWindowWrapper {
app: Arc::new(Mutex::new(child)),
updates: Some(viewport),
close_requested: Arc::new(AtomicBool::new(false)),
},
);
}
pub fn close(&mut self, window: ChildWindow) {
let id = window.viewport_id(self.sim_id);
self.children.remove(&id);
}
pub fn handle_init(&mut self, viewport_id: ViewportId, args: InitArgs) {
self.handle_event(viewport_id, |window| window.on_init(args))
}
pub fn handle_key_event(&mut self, viewport_id: ViewportId, event: &KeyEvent) -> bool {
self.handle_event(viewport_id, |window| window.handle_key_event(event))
}
pub fn handle_gamepad_event(&mut self, viewport_id: ViewportId, event: &gilrs::Event) -> bool {
self.handle_event(viewport_id, |window| window.handle_gamepad_event(event))
}
fn handle_event<F, R>(&mut self, viewport_id: ViewportId, cb: F) -> R
where
F: FnOnce(&mut dyn AppWindow) -> R,
R: Default,
{
let p2_viewport_id = ChildWindow::Player2.viewport_id(SimId::Player1);
if self.viewport_id == viewport_id {
cb(self)
} else if let Some(child) = self.children.get_mut(&viewport_id) {
cb(child.app.lock().unwrap().deref_mut().deref_mut())
} else if let Some(mut p2) = self
.children
.get_mut(&p2_viewport_id)
.map(|w| w.app.lock().unwrap())
{
if let AppWrapper::Game(g) = p2.deref_mut() {
g.handle_event(viewport_id, cb)
} else {
R::default()
}
} else {
R::default()
}
}
@@ -217,7 +364,7 @@ impl GameWindow {
{
self.client
.send_command(EmulatorCommand::StartSecondSim(None));
self.proxy.send_event(UserEvent::OpenPlayer2).unwrap();
self.open(ChildWindow::Player2);
}
if has_player_2 {
let linked = self.client.are_sims_linked();
@@ -231,55 +378,37 @@ impl GameWindow {
});
ui.menu_button("Tools", |ui| {
if ui.button("Terminal").clicked() {
self.proxy
.send_event(UserEvent::OpenTerminal(self.sim_id))
.unwrap();
self.open(ChildWindow::Terminal);
}
if ui.button("Profiler").clicked() {
self.proxy
.send_event(UserEvent::OpenProfiler(self.sim_id))
.unwrap();
self.open(ChildWindow::Profiler { launch: false });
}
if ui.button("GDB Server").clicked() {
self.proxy
.send_event(UserEvent::OpenDebugger(self.sim_id))
.unwrap();
self.open(ChildWindow::Debugger { port: None });
}
ui.separator();
if ui.button("Character Data").clicked() {
self.proxy
.send_event(UserEvent::OpenCharacterData(self.sim_id))
.unwrap();
self.open(ChildWindow::CharacterData);
}
if ui.button("Background Maps").clicked() {
self.proxy
.send_event(UserEvent::OpenBgMap(self.sim_id))
.unwrap();
self.open(ChildWindow::BgMap);
}
if ui.button("Objects").clicked() {
self.proxy
.send_event(UserEvent::OpenObjects(self.sim_id))
.unwrap();
self.open(ChildWindow::Objects);
}
if ui.button("Worlds").clicked() {
self.proxy
.send_event(UserEvent::OpenWorlds(self.sim_id))
.unwrap();
self.open(ChildWindow::Worlds);
}
if ui.button("Frame Buffers").clicked() {
self.proxy
.send_event(UserEvent::OpenFrameBuffers(self.sim_id))
.unwrap();
self.open(ChildWindow::FrameBuffers);
}
if ui.button("Registers").clicked() {
self.proxy
.send_event(UserEvent::OpenRegisters(self.sim_id))
.unwrap();
self.open(ChildWindow::Registers);
}
});
ui.menu_button("Help", |ui| {
if ui.button("About").clicked() {
self.proxy.send_event(UserEvent::OpenAbout).unwrap();
self.open(ChildWindow::About);
}
});
}
@@ -424,11 +553,11 @@ impl GameWindow {
});
ui.menu_button("Input", |ui| {
if ui.button("Bind Inputs").clicked() {
self.proxy.send_event(UserEvent::OpenInput).unwrap();
self.open(ChildWindow::Input);
}
});
if ui.button("Hotkeys").clicked() {
self.proxy.send_event(UserEvent::OpenHotkeys).unwrap();
self.open(ChildWindow::Hotkeys);
}
}
@@ -480,13 +609,6 @@ impl GameWindow {
}
impl AppWindow for GameWindow {
fn viewport_id(&self) -> ViewportId {
match self.sim_id {
SimId::Player1 => ViewportId::ROOT,
SimId::Player2 => ViewportId::from_hash_of("Player2"),
}
}
fn sim_id(&self) -> SimId {
self.sim_id
}
@@ -504,10 +626,8 @@ impl AppWindow for GameWindow {
};
self.update_config(|c| c.dimensions = dimensions);
if let Some(messages) = self.messages.as_mut() {
while let Ok(toast) = messages.try_recv() {
self.toasts.add(toast);
}
while let Ok(toast) = self.messages.try_recv() {
self.toasts.add(toast);
}
Panel::top("menubar")
.exact_size(22.0)
@@ -533,22 +653,43 @@ impl AppWindow for GameWindow {
}
});
self.toasts.show(ui);
self.children.retain(|id, child| {
if child
.close_requested
.load(std::sync::atomic::Ordering::Relaxed)
{
return false;
}
let app = child.app.clone();
let viewport_builder = child.updates.take().unwrap_or_default();
let close_requested = child.close_requested.clone();
ui.show_viewport_deferred(*id, viewport_builder, move |ui, _| {
app.lock().unwrap().show(ui);
if ui.input(|s| s.viewport().close_requested()) {
close_requested.store(true, std::sync::atomic::Ordering::Relaxed);
}
});
true
});
ui.request_repaint_after(Duration::from_millis(10));
}
fn on_init(&mut self, args: InitArgs) {
let (screen, sink) = GameScreen::init(args.render_state);
let (message_sink, message_source) = mpsc::channel();
self.client.send_command(EmulatorCommand::ConnectToSim(
self.sim_id,
sink,
message_sink,
));
self.screen = Some(screen);
self.messages = Some(message_source);
if self.screen.is_none() {
let (screen, sink) = GameScreen::init(args.render_state);
self.client.send_command(EmulatorCommand::ConnectToSim(
self.sim_id,
sink,
self.message_sink.clone(),
));
self.screen = Some(screen);
}
self.window = Some(args.window.clone());
}
}
fn on_destroy(&mut self) {
impl Drop for GameWindow {
fn drop(&mut self) {
if self.sim_id == SimId::Player2 {
self.client.send_command(EmulatorCommand::StopSecondSim);
}
@@ -561,3 +702,77 @@ struct ColorPickerState {
just_opened: bool,
unpause_on_close: bool,
}
struct ChildWindowWrapper {
app: Arc<Mutex<AppWrapper>>,
updates: Option<ViewportBuilder>,
close_requested: Arc<AtomicBool>,
}
enum AppWrapper {
Game(Box<GameWindow>),
Dyn(Box<dyn AppWindow + Send + 'static>),
}
impl AppWrapper {
fn of_game(game: GameWindow) -> Self {
Self::Game(Box::new(game))
}
fn of_dyn<T: AppWindow + Send + 'static>(inner: T) -> Self {
Self::Dyn(Box::new(inner))
}
}
impl Deref for AppWrapper {
type Target = dyn AppWindow + Send + 'static;
fn deref(&self) -> &Self::Target {
match self {
Self::Dyn(inner) => inner.as_ref(),
Self::Game(inner) => inner.as_ref(),
}
}
}
impl DerefMut for AppWrapper {
fn deref_mut(&mut self) -> &mut Self::Target {
match self {
Self::Dyn(inner) => inner.as_mut(),
Self::Game(inner) => inner.as_mut(),
}
}
}
#[derive(Debug)]
pub enum ChildWindow {
About,
CharacterData,
BgMap,
Objects,
Worlds,
FrameBuffers,
Registers,
Terminal,
Profiler { launch: bool },
Debugger { port: Option<u16> },
Input,
Hotkeys,
Player2,
}
impl ChildWindow {
fn viewport_id(&self, sim_id: SimId) -> ViewportId {
ViewportId::from_hash_of(format!("{sim_id:?}{}", self.name()))
}
fn name(&self) -> &'static str {
match self {
Self::About => "About",
Self::CharacterData => "CharacterData",
Self::BgMap => "BgMap",
Self::Objects => "Objects",
Self::Worlds => "Worlds",
Self::FrameBuffers => "FrameBuffers",
Self::Registers => "Registers",
Self::Terminal => "Terminal",
Self::Profiler { .. } => "Profiler",
Self::Debugger { .. } => "Debugger",
Self::Input => "Input",
Self::Hotkeys => "Hotkeys",
Self::Player2 => "Player2",
}
}
}
src/window/game_screen.rs
+1 -3
View File
@@ -14,7 +14,7 @@ pub struct GameScreen {
}
impl GameScreen {
fn init_pipeline(render_state: &egui_wgpu::RenderState) {
pub fn init_pipeline(render_state: &egui_wgpu::RenderState) {
let device = &render_state.device;
let bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
@@ -117,8 +117,6 @@ impl GameScreen {
}
pub fn init(render_state: &egui_wgpu::RenderState) -> (Self, TextureSink) {
Self::init_pipeline(render_state);
let device = &render_state.device;
let queue = &render_state.queue;
src/window/gdb.rs
+1 -5
View File
@@ -1,4 +1,4 @@
use egui::{Button, CentralPanel, TextEdit, ViewportBuilder, ViewportId};
use egui::{Button, CentralPanel, TextEdit, ViewportBuilder};
use winit::event_loop::EventLoopProxy;
use crate::{
@@ -42,10 +42,6 @@ impl GdbServerWindow {
}
impl AppWindow for GdbServerWindow {
fn viewport_id(&self) -> ViewportId {
ViewportId::from_hash_of(format!("Debugger-{}", self.sim_id))
}
fn sim_id(&self) -> SimId {
self.sim_id
}
src/window/hotkeys.rs
-5
View File
@@ -1,6 +1,5 @@
use egui::{
Button, CentralPanel, Event, KeyboardShortcut, Label, Layout, Slider, Ui, ViewportBuilder,
ViewportId,
};
use egui_extras::{Column, TableBuilder};
@@ -125,10 +124,6 @@ impl HotkeysWindow {
}
impl AppWindow for HotkeysWindow {
fn viewport_id(&self) -> ViewportId {
ViewportId::from_hash_of("shortcuts")
}
fn initial_viewport(&self) -> ViewportBuilder {
ViewportBuilder::default()
.with_title("Keyboard Shortcuts")
src/window/input.rs
+1 -5
View File
@@ -1,4 +1,4 @@
use egui::{Button, CentralPanel, Label, Layout, Panel, Ui, ViewportBuilder, ViewportId};
use egui::{Button, CentralPanel, Label, Layout, Panel, Ui, ViewportBuilder};
use egui_extras::{Column, TableBuilder};
use gilrs::{EventType, GamepadId};
use std::sync::RwLock;
@@ -160,10 +160,6 @@ impl InputWindow {
}
impl AppWindow for InputWindow {
fn viewport_id(&self) -> ViewportId {
ViewportId::from_hash_of("input")
}
fn initial_viewport(&self) -> ViewportBuilder {
ViewportBuilder::default()
.with_title("Bind Inputs")
src/window/profile.rs
+1 -5
View File
@@ -1,7 +1,7 @@
use std::{fs, sync::Arc, time::Duration};
use anyhow::Result;
use egui::{Button, CentralPanel, Checkbox, Label, ViewportBuilder, ViewportId};
use egui::{Button, CentralPanel, Checkbox, Label, ViewportBuilder};
use egui_notify::{Anchor, Toast, Toasts};
use winit::window::Window;
@@ -82,10 +82,6 @@ impl ProfileWindow {
}
impl AppWindow for ProfileWindow {
fn viewport_id(&self) -> ViewportId {
ViewportId::from_hash_of(format!("Profile-{}", self.sim_id))
}
fn sim_id(&self) -> SimId {
self.sim_id
}
src/window/terminal.rs
+1 -7
View File
@@ -1,8 +1,6 @@
use std::{collections::VecDeque, sync::mpsc};
use egui::{
Align, CentralPanel, FontFamily, Label, RichText, ScrollArea, Ui, ViewportBuilder, ViewportId,
};
use egui::{Align, CentralPanel, FontFamily, Label, RichText, ScrollArea, Ui, ViewportBuilder};
use crate::emulator::{EmulatorClient, EmulatorCommand, SimId};
@@ -31,10 +29,6 @@ impl TerminalWindow {
}
impl AppWindow for TerminalWindow {
fn viewport_id(&self) -> ViewportId {
ViewportId::from_hash_of(format!("terminal-{}", self.sim_id))
}
fn sim_id(&self) -> SimId {
self.sim_id
}
src/window/vip/bgmap.rs
+1 -5
View File
@@ -2,7 +2,7 @@ use std::sync::Arc;
use egui::{
Align, CentralPanel, Checkbox, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit,
TextureOptions, Ui, ViewportBuilder, ViewportId,
TextureOptions, Ui, ViewportBuilder,
};
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
@@ -169,10 +169,6 @@ impl BgMapWindow {
}
impl AppWindow for BgMapWindow {
fn viewport_id(&self) -> ViewportId {
ViewportId::from_hash_of(format!("bgmap-{}", self.sim_id))
}
fn sim_id(&self) -> SimId {
self.sim_id
}
src/window/vip/chardata.rs
+1 -5
View File
@@ -2,7 +2,7 @@ use std::fmt::Display;
use egui::{
Align, CentralPanel, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit, TextureOptions,
Ui, Vec2, ViewportBuilder, ViewportId,
Ui, Vec2, ViewportBuilder,
};
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
use serde::{Deserialize, Serialize};
@@ -231,10 +231,6 @@ impl CharacterDataWindow {
}
impl AppWindow for CharacterDataWindow {
fn viewport_id(&self) -> ViewportId {
ViewportId::from_hash_of(format!("chardata-{}", self.sim_id))
}
fn sim_id(&self) -> SimId {
self.sim_id
}
src/window/vip/framebuffer.rs
+1 -5
View File
@@ -1,6 +1,6 @@
use egui::{
Align, CentralPanel, Color32, Image, ScrollArea, Slider, TextEdit, TextureOptions, Ui,
ViewportBuilder, ViewportId,
ViewportBuilder,
};
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
@@ -134,10 +134,6 @@ impl FrameBufferWindow {
}
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
}
src/window/vip/object.rs
+1 -5
View File
@@ -2,7 +2,7 @@ use std::sync::Arc;
use egui::{
Align, CentralPanel, Checkbox, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit,
TextureOptions, Ui, ViewportBuilder, ViewportId,
TextureOptions, Ui, ViewportBuilder,
};
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
@@ -190,10 +190,6 @@ impl ObjectWindow {
}
impl AppWindow for ObjectWindow {
fn viewport_id(&self) -> egui::ViewportId {
ViewportId::from_hash_of(format!("object-{}", self.sim_id))
}
fn sim_id(&self) -> SimId {
self.sim_id
}
src/window/vip/registers.rs
+1 -5
View File
@@ -2,7 +2,7 @@ use std::sync::Arc;
use egui::{
Align, Button, CentralPanel, Checkbox, Color32, Direction, Label, Layout, ScrollArea, TextEdit,
Ui, ViewportBuilder, ViewportId,
Ui, ViewportBuilder,
};
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
@@ -630,10 +630,6 @@ fn read_address<T: MemoryValue>(registers: &MemoryRef, address: usize) -> T {
}
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
}
src/window/vip/world.rs
+1 -5
View File
@@ -2,7 +2,7 @@ use std::{fmt::Display, sync::Arc};
use egui::{
Align, CentralPanel, Checkbox, Color32, ComboBox, Image, ScrollArea, Slider, TextEdit,
TextureOptions, Ui, ViewportBuilder, ViewportId,
TextureOptions, Ui, ViewportBuilder,
};
use egui_extras::{Column, Size, StripBuilder, TableBuilder};
use fixed::{
@@ -506,10 +506,6 @@ impl WorldWindow {
}
impl AppWindow for WorldWindow {
fn viewport_id(&self) -> ViewportId {
ViewportId::from_hash_of(format!("world-{}", self.sim_id))
}
fn sim_id(&self) -> SimId {
self.sim_id
}