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

Update egui/wgpu another major version

Browse Source
This commit is contained in:
SonicSwordcane
2025-08-03 17:29:46 -04:00
parent 43288fc71f
commit 110a31870f
7 changed files with 144 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app.rs
+3 -6
View File
@@ -334,12 +334,9 @@ impl WgpuState {
}))
.expect("could not create adapter");
let trace_path = std::env::var("WGPU_TRACE");
let (device, queue) = pollster::block_on(adapter.request_device(
&(*device_descriptor)(&adapter),
trace_path.ok().as_ref().map(std::path::Path::new),
))
.expect("could not request device");
let (device, queue) =
pollster::block_on(adapter.request_device(&(*device_descriptor)(&adapter)))
.expect("could not request device");
Self {
instance,
adapter,
src/emulator.rs
+4 -5
View File
@@ -9,12 +9,13 @@ use std::{
atomic::{AtomicBool, Ordering},
mpsc::{self, RecvError, TryRecvError},
},
time::Duration,
};
use anyhow::Result;
use atomic::Atomic;
use bytemuck::NoUninit;
use egui_toast::{Toast, ToastKind, ToastOptions};
use egui_notify::Toast;
use tracing::{error, warn};
use crate::{
@@ -726,10 +727,8 @@ impl Emulator {
.get(&sim_id)
.or_else(|| self.messages.get(&SimId::Player1));
if let Some(msg) = messages {
let toast = Toast::new()
.kind(ToastKind::Error)
.options(ToastOptions::default().duration_in_seconds(5.0))
.text(&message);
let mut toast = Toast::error(&message);
toast.duration(Some(Duration::from_secs(5)));
if msg.send(toast).is_ok() {
return;
}
src/images.rs
+2 -2
View File
@@ -193,8 +193,8 @@ struct ImageState {
impl ImageState {
fn new(size: [usize; 2]) -> Self {
let buffers = [
Arc::new(ColorImage::new(size, Color32::BLACK)),
Arc::new(ColorImage::new(size, Color32::BLACK)),
Arc::new(ColorImage::filled(size, Color32::BLACK)),
Arc::new(ColorImage::filled(size, Color32::BLACK)),
];
let sink = buffers[0].clone();
Self {
src/window/game.rs
+24 -53
View File
@@ -1,4 +1,4 @@
use std::sync::mpsc;
use std::{sync::mpsc, time::Duration};
use crate::{
app::UserEvent,
@@ -8,10 +8,10 @@ use crate::{
};
use anyhow::Context as _;
use egui::{
Align2, Button, CentralPanel, Color32, Context, Direction, Frame, TopBottomPanel, Ui, Vec2,
ViewportBuilder, ViewportCommand, ViewportId, Window, menu,
Align2, Button, CentralPanel, Color32, Context, Frame, MenuBar, TopBottomPanel, Ui, Vec2,
ViewportBuilder, ViewportCommand, ViewportId, Window,
};
use egui_toast::{Toast, ToastKind, ToastOptions, Toasts};
use egui_notify::{Anchor, Toast, Toasts};
use serde::{Deserialize, Serialize};
use winit::event_loop::EventLoopProxy;
@@ -43,6 +43,7 @@ pub struct GameWindow {
shortcuts: ShortcutProvider,
sim_id: SimId,
config: GameConfig,
toasts: Toasts,
screen: Option<GameScreen>,
messages: Option<mpsc::Receiver<Toast>>,
color_picker: Option<ColorPickerState>,
@@ -57,6 +58,10 @@ impl GameWindow {
sim_id: SimId,
) -> Self {
let config = load_config(&persistence, sim_id);
let toasts = Toasts::new()
.with_anchor(Anchor::BottomLeft)
.with_margin((10.0, 10.0).into())
.reverse(true);
Self {
client,
proxy,
@@ -64,13 +69,14 @@ impl GameWindow {
shortcuts,
sim_id,
config,
toasts,
screen: None,
messages: None,
color_picker: None,
}
}
fn show_menu(&mut self, ctx: &Context, ui: &mut Ui, toasts: &mut Toasts) {
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;
@@ -119,7 +125,7 @@ impl GameWindow {
if autopause {
self.client.send_command(EmulatorCommand::Pause);
}
pollster::block_on(self.take_screenshot(toasts));
pollster::block_on(self.take_screenshot());
if autopause {
self.client.send_command(EmulatorCommand::Resume);
}
@@ -139,7 +145,6 @@ impl GameWindow {
self.client
.send_command(EmulatorCommand::LoadGame(self.sim_id, path));
}
ui.close_menu();
}
if ui
.add(self.button_for(ui.ctx(), "Quit", Command::Quit))
@@ -158,7 +163,6 @@ impl GameWindow {
.clicked()
{
self.client.send_command(EmulatorCommand::Pause);
ui.close_menu();
}
} else if ui
.add_enabled(
@@ -168,7 +172,6 @@ impl GameWindow {
.clicked()
{
self.client.send_command(EmulatorCommand::Resume);
ui.close_menu();
}
if ui
.add_enabled(is_ready, self.button_for(ui.ctx(), "Reset", Command::Reset))
@@ -176,7 +179,6 @@ impl GameWindow {
{
self.client
.send_command(EmulatorCommand::Reset(self.sim_id));
ui.close_menu();
}
ui.separator();
if ui
@@ -187,7 +189,6 @@ impl GameWindow {
.clicked()
{
self.client.send_command(EmulatorCommand::FrameAdvance);
ui.close_menu();
}
ui.separator();
if ui
@@ -197,8 +198,7 @@ impl GameWindow {
)
.clicked()
{
pollster::block_on(self.take_screenshot(toasts));
ui.close_menu();
pollster::block_on(self.take_screenshot());
}
});
ui.menu_button("Options", |ui| self.show_options_menu(ctx, ui));
@@ -211,17 +211,14 @@ impl GameWindow {
self.client
.send_command(EmulatorCommand::StartSecondSim(None));
self.proxy.send_event(UserEvent::OpenPlayer2).unwrap();
ui.close_menu();
}
if has_player_2 {
let linked = self.client.are_sims_linked();
if linked && ui.button("Unlink").clicked() {
self.client.send_command(EmulatorCommand::Unlink);
ui.close_menu();
}
if !linked && ui.button("Link").clicked() {
self.client.send_command(EmulatorCommand::Link);
ui.close_menu();
}
}
});
@@ -230,78 +227,63 @@ impl GameWindow {
self.proxy
.send_event(UserEvent::OpenTerminal(self.sim_id))
.unwrap();
ui.close_menu();
}
if ui.button("GDB Server").clicked() {
self.proxy
.send_event(UserEvent::OpenDebugger(self.sim_id))
.unwrap();
ui.close_menu();
}
ui.separator();
if ui.button("Character Data").clicked() {
self.proxy
.send_event(UserEvent::OpenCharacterData(self.sim_id))
.unwrap();
ui.close_menu();
}
if ui.button("Background Maps").clicked() {
self.proxy
.send_event(UserEvent::OpenBgMap(self.sim_id))
.unwrap();
ui.close_menu();
}
if ui.button("Objects").clicked() {
self.proxy
.send_event(UserEvent::OpenObjects(self.sim_id))
.unwrap();
ui.close_menu();
}
if ui.button("Worlds").clicked() {
self.proxy
.send_event(UserEvent::OpenWorlds(self.sim_id))
.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() {
self.proxy.send_event(UserEvent::OpenAbout).unwrap();
ui.close_menu();
}
});
}
async fn take_screenshot(&self, toasts: &mut Toasts) {
async fn take_screenshot(&mut self) {
match self.try_take_screenshot().await {
Ok(Some(path)) => {
toasts.add(
Toast::new()
.kind(ToastKind::Info)
.options(ToastOptions::default().duration_in_seconds(5.0))
.text(format!("Saved to {path}")),
);
let mut toast = Toast::info(format!("Saved to {path}"));
toast.duration(Some(Duration::from_secs(5)));
self.toasts.add(toast);
}
Ok(None) => {}
Err(error) => {
toasts.add(
Toast::new()
.kind(ToastKind::Error)
.options(ToastOptions::default().duration_in_seconds(5.0))
.text(format!("{error:#}")),
);
let mut toast = Toast::error(format!("{error:#}"));
toast.duration(Some(Duration::from_secs(5)));
self.toasts.add(toast);
}
}
}
@@ -348,7 +330,6 @@ impl GameWindow {
.clicked()
{
ctx.send_viewport_cmd(ViewportCommand::InnerSize(dims));
ui.close_menu();
}
}
});
@@ -385,13 +366,11 @@ impl GameWindow {
c.display_mode = display_mode;
c.dimensions = current_dims * scale;
});
ui.close_menu();
});
ui.menu_button("Colors", |ui| {
for preset in COLOR_PRESETS {
if ui.color_pair_button(preset[0], preset[1]).clicked() {
self.update_config(|c| c.colors = preset);
ui.close_menu();
}
}
ui.with_layout(ui.layout().with_cross_align(egui::Align::Center), |ui| {
@@ -412,7 +391,6 @@ impl GameWindow {
just_opened: true,
unpause_on_close: is_running,
});
ui.close_menu();
}
});
});
@@ -423,23 +401,19 @@ impl GameWindow {
if ui.selectable_button(p1_enabled, "Player 1").clicked() {
self.client
.send_command(EmulatorCommand::SetAudioEnabled(!p1_enabled, p2_enabled));
ui.close_menu();
}
if ui.selectable_button(p2_enabled, "Player 2").clicked() {
self.client
.send_command(EmulatorCommand::SetAudioEnabled(p1_enabled, !p2_enabled));
ui.close_menu();
}
});
ui.menu_button("Input", |ui| {
if ui.button("Bind Inputs").clicked() {
self.proxy.send_event(UserEvent::OpenInput).unwrap();
ui.close_menu();
}
});
if ui.button("Hotkeys").clicked() {
self.proxy.send_event(UserEvent::OpenHotkeys).unwrap();
ui.close_menu();
}
}
@@ -535,19 +509,16 @@ impl AppWindow for GameWindow {
};
self.update_config(|c| c.dimensions = dimensions);
let mut toasts = Toasts::new()
.anchor(Align2::LEFT_BOTTOM, (10.0, 10.0))
.direction(Direction::BottomUp);
if let Some(messages) = self.messages.as_mut() {
while let Ok(toast) = messages.try_recv() {
toasts.add(toast);
self.toasts.add(toast);
}
}
TopBottomPanel::top("menubar")
.exact_height(22.0)
.show(ctx, |ui| {
menu::bar(ui, |ui| {
self.show_menu(ctx, ui, &mut toasts);
MenuBar::new().ui(ui, |ui| {
self.show_menu(ctx, ui);
});
});
if self.color_picker.is_some() {
@@ -566,7 +537,7 @@ impl AppWindow for GameWindow {
ui.add(screen);
}
});
toasts.show(ctx);
self.toasts.show(ctx);
}
fn on_init(&mut self, _ctx: &Context, render_state: &egui_wgpu::RenderState) {
src/window/utils.rs
+1 -1
View File
@@ -49,7 +49,7 @@ impl UiExt for Ui {
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));
self.scope_builder(UiBuilder::new().max_rect(text_rect), |ui| ui.label(text));
if old_rect.width() > 0.0 {
self.advance_cursor_after_rect(old_rect);
}