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

Update dependencies

Browse Source
This commit is contained in:
SonicSwordcane
2026-09-06 17:24:59 -04:00
parent ec7a89d9da
commit 7d517e932e
17 changed files with 575 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+539 -479
View File
File diff suppressed because it is too large Load Diff
Cargo.toml
+11 -11
View File
@@ -10,18 +10,18 @@ edition = "2024"
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
atoi = "3" atoi = "3"
audioadapter-buffers = "4" audioadapter-buffers = "5"
atomic = "0.6" atomic = "0.6"
bitflags = { version = "2", features = ["serde"] } bitflags = { version = "2", features = ["serde"] }
bytemuck = { version = "1", features = ["derive"] } bytemuck = { version = "1", features = ["derive"] }
clap = { version = "4", features = ["derive"] } clap = { version = "4", features = ["derive"] }
cpal = "0.18" cpal = "0.18"
directories = "6" directories = "6"
egui = { version = "0.34", features = ["persistence", "serde"] } egui = { version = "0.36", features = ["persistence", "serde"] }
egui_extras = { version = "0.34", features = ["image"] } egui_extras = { version = "0.36", features = ["image"] }
egui-notify = "0.22" egui-notify = "0.23"
egui-winit = "0.34" egui-winit = "0.36"
egui-wgpu = { version = "0.34", features = ["winit"] } egui-wgpu = { version = "0.36", features = ["winit"] }
fxprof-processed-profile = "0.8" fxprof-processed-profile = "0.8"
fixed = { version = "1.28", features = ["num-traits"] } fixed = { version = "1.28", features = ["num-traits"] }
gilrs = { version = "0.11", features = ["serde-serialize"] } gilrs = { version = "0.11", features = ["serde-serialize"] }
@@ -31,22 +31,22 @@ image = { version = "0.25", default-features = false, features = ["png"] }
itertools = "0.15" itertools = "0.15"
normpath = "1" normpath = "1"
notify = "8" notify = "8"
num-derive = "0.4" num-derive = "0.5"
num-traits = "0.2" num-traits = "0.2"
object = "0.39" object = "0.40"
oneshot = { version = "0.2", features = ["async", "std"] } oneshot = { version = "0.2", features = ["async", "std"] }
pollster = "1" pollster = "1"
rand = "0.10" rand = "0.10"
rfd = "0.17" rfd = "0.17"
rtrb = "0.3" rtrb = "0.4"
rubato = "4" rubato = "5"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_json = "1" serde_json = "1"
thread-priority = "3" thread-priority = "3"
tokio = { version = "1", features = ["io-util", "macros", "net", "rt", "sync", "time"] } tokio = { version = "1", features = ["io-util", "macros", "net", "rt", "sync", "time"] }
tracing = { version = "0.1", features = ["release_max_level_debug"] } tracing = { version = "0.1", features = ["release_max_level_debug"] }
tracing-subscriber = { version = "0.3", features = ["env-filter"] } tracing-subscriber = { version = "0.3", features = ["env-filter"] }
wgpu = { version = "29", features = ["serde"] } wgpu = { version = "30", features = ["serde"] }
wholesym = "0.8" wholesym = "0.8"
winit = { version = "0.30", features = ["serde"] } winit = { version = "0.30", features = ["serde"] }
build.Dockerfile
+1 -1
View File
@@ -16,7 +16,7 @@ RUN apt-get update && \
ln -s $(which ld64.lld-22) /usr/bin/ld64.lld && \ ln -s $(which ld64.lld-22) /usr/bin/ld64.lld && \
SDK_VERSION=14.5 UNATTENDED=1 ENABLE_COMPILER_RT_INSTALL=1 TARGET_DIR=/osxcross ./build.sh SDK_VERSION=14.5 UNATTENDED=1 ENABLE_COMPILER_RT_INSTALL=1 TARGET_DIR=/osxcross ./build.sh
FROM rust:1.97-trixie FROM rust:1.98-trixie
ADD --chmod=644 "https://apt.llvm.org/llvm-snapshot.gpg.key" /etc/apt/trusted.gpg.d/apt.llvm.org.asc ADD --chmod=644 "https://apt.llvm.org/llvm-snapshot.gpg.key" /etc/apt/trusted.gpg.d/apt.llvm.org.asc
COPY llvm.sources /etc/apt/sources.list.d/llvm.sources COPY llvm.sources /etc/apt/sources.list.d/llvm.sources
RUN rustup target add x86_64-pc-windows-msvc && \ RUN rustup target add x86_64-pc-windows-msvc && \
src/app.rs
+5 -3
View File
@@ -56,7 +56,7 @@ impl SharedViewportState {
fn init_painter(&mut self, ctx: &Context, window: &Window) -> &mut Painter { fn init_painter(&mut self, ctx: &Context, window: &Window) -> &mut Painter {
if self.painter.is_none() { if self.painter.is_none() {
let wgpu_config = egui_wgpu::WgpuConfiguration { let wgpu_config = egui_wgpu::WgpuConfiguration {
present_mode: wgpu::PresentMode::AutoVsync, surface: egui_wgpu::SurfaceConfig::HIGH_THROUGHPUT,
wgpu_setup: egui_wgpu::WgpuSetup::Existing(self.wgpu.init(window)), wgpu_setup: egui_wgpu::WgpuSetup::Existing(self.wgpu.init(window)),
..egui_wgpu::WgpuConfiguration::default() ..egui_wgpu::WgpuConfiguration::default()
}; };
@@ -257,7 +257,7 @@ impl Application {
continue; continue;
} }
input.viewports = self.shared.viewport_info.clone(); input.viewports = self.shared.viewport_info.clone();
let output = self.ctx.run_ui(input, |ui| { let mut output = self.ctx.run_ui(input, |ui| {
if viewport.id == ViewportId::ROOT { if viewport.id == ViewportId::ROOT {
self.app.show(ui); self.app.show(ui);
} else if let Some(cb) = ui.viewport(|v| v.viewport_ui_cb.clone()) { } else if let Some(cb) = ui.viewport(|v| v.viewport_ui_cb.clone()) {
@@ -304,8 +304,9 @@ impl Application {
output.pixels_per_point, output.pixels_per_point,
[0.0, 0.0, 0.0, 0.0], [0.0, 0.0, 0.0, 0.0],
&clipped_primitives, &clipped_primitives,
&output.textures_delta, &mut output.textures_delta,
vec![], vec![],
&viewport.window,
); );
} }
let mut active_viewports = ViewportIdSet::default(); let mut active_viewports = ViewportIdSet::default();
@@ -550,6 +551,7 @@ impl WgpuState {
power_preference, power_preference,
compatible_surface: Some(&surface), compatible_surface: Some(&surface),
force_fallback_adapter, force_fallback_adapter,
apply_limit_buckets: false,
})) }))
.expect("could not create adapter"); .expect("could not create adapter");
debug!("selected adapter: {:?}", adapter.get_info()); debug!("selected adapter: {:?}", adapter.get_info());
src/window/about.rs
+1 -1
View File
@@ -12,7 +12,7 @@ impl AppWindow for AboutWindow {
} }
fn show(&mut self, ui: &mut Ui) { fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| { CentralPanel::default().show(ui, |ui| {
ui.vertical_centered(|ui| { ui.vertical_centered(|ui| {
ui.label("Lemur Virtual Boy Emulator"); ui.label("Lemur Virtual Boy Emulator");
ui.label(format!("Version {}", env!("CARGO_PKG_VERSION"))); ui.label(format!("Version {}", env!("CARGO_PKG_VERSION")));
src/window/game.rs
+5 -7
View File
@@ -708,13 +708,11 @@ impl AppWindow for GameWindow {
while let Ok(toast) = self.messages.try_recv() { while let Ok(toast) = self.messages.try_recv() {
self.toasts.add(toast); self.toasts.add(toast);
} }
Panel::top("menubar") Panel::top("menubar").exact_size(22.0).show(ui, |ui| {
.exact_size(22.0) MenuBar::new().ui(ui, |ui| {
.show_inside(ui, |ui| { self.show_menu(ui);
MenuBar::new().ui(ui, |ui| {
self.show_menu(ui);
});
}); });
});
if self.color_picker.is_some() { if self.color_picker.is_some() {
Window::new("Color Picker") Window::new("Color Picker")
.title_bar(false) .title_bar(false)
@@ -725,7 +723,7 @@ impl AppWindow for GameWindow {
}); });
} }
let frame = Frame::central_panel(ui.style()).fill(Color32::BLACK); let frame = Frame::central_panel(ui.style()).fill(Color32::BLACK);
CentralPanel::default().frame(frame).show_inside(ui, |ui| { CentralPanel::default().frame(frame).show(ui, |ui| {
if let Some(screen) = self.screen.as_mut() { if let Some(screen) = self.screen.as_mut() {
screen.update(self.config.display_mode, self.config.colors); screen.update(self.config.display_mode, self.config.colors);
ui.add(screen); ui.add(screen);
src/window/gdb.rs
+1 -1
View File
@@ -55,7 +55,7 @@ impl AppWindow for GdbServerWindow {
fn show(&mut self, ui: &mut egui::Ui) { fn show(&mut self, ui: &mut egui::Ui) {
let port_num: Option<u16> = self.port_str.parse().ok(); let port_num: Option<u16> = self.port_str.parse().ok();
let status = self.server.status(); let status = self.server.status();
CentralPanel::default().show_inside(ui, |ui| { CentralPanel::default().show(ui, |ui| {
ui.horizontal(|ui| { ui.horizontal(|ui| {
if port_num.is_none() { if port_num.is_none() {
let style = ui.style_mut(); let style = ui.style_mut();
src/window/hotkeys.rs
+1 -1
View File
@@ -131,7 +131,7 @@ impl AppWindow for HotkeysWindow {
} }
fn show(&mut self, ui: &mut Ui) { fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| { CentralPanel::default().show(ui, |ui| {
ui.horizontal(|ui| { ui.horizontal(|ui| {
if ui.button("Use defaults").clicked() { if ui.button("Use defaults").clicked() {
self.shortcuts.reset(); self.shortcuts.reset();
src/window/input.rs
+3 -3
View File
@@ -70,7 +70,7 @@ impl InputWindow {
.column(Column::remainder()) .column(Column::remainder())
.cell_layout(Layout::left_to_right(egui::Align::Center)) .cell_layout(Layout::left_to_right(egui::Align::Center))
.body(|mut body| { .body(|mut body| {
for keys in KEY_NAMES.chunks_exact(2) { for keys in KEY_NAMES.as_chunks::<2>().0 {
body.row(20.0, |mut row| { body.row(20.0, |mut row| {
for (key, name) in keys { for (key, name) in keys {
let binding = names.remove(key).map(|mut s| { let binding = names.remove(key).map(|mut s| {
@@ -167,7 +167,7 @@ impl AppWindow for InputWindow {
} }
fn show(&mut self, ui: &mut Ui) { fn show(&mut self, ui: &mut Ui) {
Panel::top("options").show_inside(ui, |ui| { Panel::top("options").show(ui, |ui| {
ui.horizontal(|ui| { ui.horizontal(|ui| {
let old_active_tab = self.active_tab; let old_active_tab = self.active_tab;
ui.selectable_value(&mut self.active_tab, InputTab::Player1, "Player 1"); ui.selectable_value(&mut self.active_tab, InputTab::Player1, "Player 1");
@@ -182,7 +182,7 @@ impl AppWindow for InputWindow {
} }
}); });
}); });
CentralPanel::default().show_inside(ui, |ui| { CentralPanel::default().show(ui, |ui| {
match self.active_tab { match self.active_tab {
InputTab::Player1 => self.show_key_bindings(ui, SimId::Player1), InputTab::Player1 => self.show_key_bindings(ui, SimId::Player1),
InputTab::Player2 => self.show_key_bindings(ui, SimId::Player2), InputTab::Player2 => self.show_key_bindings(ui, SimId::Player2),
src/window/profile.rs
+1 -1
View File
@@ -94,7 +94,7 @@ impl AppWindow for ProfileWindow {
fn show(&mut self, ui: &mut egui::Ui) { fn show(&mut self, ui: &mut egui::Ui) {
let status = self.profiler.status(); let status = self.profiler.status();
let recording = matches!(status, ProfilerStatus::Recording); let recording = matches!(status, ProfilerStatus::Recording);
CentralPanel::default().show_inside(ui, |ui| { CentralPanel::default().show(ui, |ui| {
ui.horizontal_wrapped(|ui| { ui.horizontal_wrapped(|ui| {
ui.spacing_mut().item_spacing.x = 0.0; ui.spacing_mut().item_spacing.x = 0.0;
ui.add( ui.add(
src/window/terminal.rs
+1 -1
View File
@@ -54,7 +54,7 @@ impl AppWindow for TerminalWindow {
} }
self.lines.back_mut().unwrap().push_str(rest); self.lines.back_mut().unwrap().push_str(rest);
} }
CentralPanel::default().show_inside(ui, |ui| { CentralPanel::default().show(ui, |ui| {
ScrollArea::vertical() ScrollArea::vertical()
.stick_to_bottom(true) .stick_to_bottom(true)
.auto_shrink([false, false]) .auto_shrink([false, false])
src/window/vip/bgmap.rs
+1 -1
View File
@@ -203,7 +203,7 @@ impl AppWindow for BgMapWindow {
fn show(&mut self, ui: &mut Ui) { fn show(&mut self, ui: &mut Ui) {
self.state.load(ui); self.state.load(ui);
CentralPanel::default().show_inside(ui, |ui| { CentralPanel::default().show(ui, |ui| {
ui.horizontal_top(|ui| { ui.horizontal_top(|ui| {
StripBuilder::new(ui) StripBuilder::new(ui)
.size(Size::relative(0.3).at_most(200.0)) .size(Size::relative(0.3).at_most(200.0))
src/window/vip/chardata.rs
+1 -1
View File
@@ -263,7 +263,7 @@ impl AppWindow for CharacterDataWindow {
fn show(&mut self, ui: &mut Ui) { fn show(&mut self, ui: &mut Ui) {
self.state.load(ui); self.state.load(ui);
CentralPanel::default().show_inside(ui, |ui| { CentralPanel::default().show(ui, |ui| {
ui.horizontal_top(|ui| { ui.horizontal_top(|ui| {
StripBuilder::new(ui) StripBuilder::new(ui)
.size(Size::relative(0.3).at_most(200.0)) .size(Size::relative(0.3).at_most(200.0))
src/window/vip/framebuffer.rs
+1 -1
View File
@@ -163,7 +163,7 @@ impl AppWindow for FrameBufferWindow {
fn show(&mut self, ui: &mut Ui) { fn show(&mut self, ui: &mut Ui) {
self.state.load(ui); self.state.load(ui);
CentralPanel::default().show_inside(ui, |ui| { CentralPanel::default().show(ui, |ui| {
ui.horizontal_top(|ui| { ui.horizontal_top(|ui| {
StripBuilder::new(ui) StripBuilder::new(ui)
.size(Size::relative(0.3).at_most(200.0)) .size(Size::relative(0.3).at_most(200.0))
src/window/vip/object.rs
+1 -1
View File
@@ -219,7 +219,7 @@ impl AppWindow for ObjectWindow {
fn show(&mut self, ui: &mut Ui) { fn show(&mut self, ui: &mut Ui) {
self.state.load(ui); self.state.load(ui);
CentralPanel::default().show_inside(ui, |ui| { CentralPanel::default().show(ui, |ui| {
ui.horizontal_top(|ui| { ui.horizontal_top(|ui| {
StripBuilder::new(ui) StripBuilder::new(ui)
.size(Size::relative(0.3).at_most(200.0)) .size(Size::relative(0.3).at_most(200.0))
src/window/vip/registers.rs
+1 -1
View File
@@ -641,7 +641,7 @@ impl AppWindow for RegisterWindow {
} }
fn show(&mut self, ui: &mut Ui) { fn show(&mut self, ui: &mut Ui) {
CentralPanel::default().show_inside(ui, |ui| { CentralPanel::default().show(ui, |ui| {
ScrollArea::vertical().show(ui, |ui| { ScrollArea::vertical().show(ui, |ui| {
ui.horizontal_top(|ui| { ui.horizontal_top(|ui| {
let width = ui.available_width(); let width = ui.available_width();
src/window/vip/world.rs
+1 -1
View File
@@ -539,7 +539,7 @@ impl AppWindow for WorldWindow {
fn show(&mut self, ui: &mut Ui) { fn show(&mut self, ui: &mut Ui) {
self.state.load(ui); self.state.load(ui);
CentralPanel::default().show_inside(ui, |ui| { CentralPanel::default().show(ui, |ui| {
ui.horizontal_top(|ui| { ui.horizontal_top(|ui| {
StripBuilder::new(ui) StripBuilder::new(ui)
.size(Size::relative(0.3).at_most(200.0)) .size(Size::relative(0.3).at_most(200.0))