chore: Release lemur version 0.4.6

Cargo.toml

@@ -4,8 +4,8 @@ description = "An emulator for the Virtual Boy."
 repository = "https://git.virtual-boy.com/PVB/lemur"
 publish = false
 license = "MIT"
-version = "0.4.4"
-edition = "2021"
+version = "0.4.6"
+edition = "2024"
 
 [dependencies]
 anyhow = "1"
@@ -15,7 +15,7 @@ bitflags = { version = "2", features = ["serde"] }
 bytemuck = { version = "1", features = ["derive"] }
 clap = { version = "4", features = ["derive"] }
 cpal = { git = "https://github.com/sidit77/cpal.git", rev = "66ed6be" }
-directories = "5"
+directories = "6"
 egui = { version = "0.30", features = ["serde"] }
 egui_extras = { version = "0.30", features = ["image"] }
 egui-toast = { git = "https://github.com/urholaukkarinen/egui-toast.git", rev = "d0bcf97" }
@@ -30,7 +30,7 @@ num-derive = "0.4"
 num-traits = "0.2"
 oneshot = "0.1"
 pollster = "0.4"
-rfd = "0.15"
+rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "tokio"]}
 rtrb = "0.3"
 rubato = "0.16"
 serde = { version = "1", features = ["derive"] }
@@ -43,7 +43,7 @@ wgpu = "23"
 winit = { version = "0.30", features = ["serde"] }
 
 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.58", features = ["Win32_System_Threading"] }
+windows = { version = "0.59", features = ["Win32_System_Threading"] }
 
 [build-dependencies]
 cc = "1"

README.md

@@ -6,6 +6,8 @@ A Virtual Boy emulator built around the shrooms-vb core. Written in Rust, using
 
 Install the following dependencies:
  - `cargo` (via [rustup](https://rustup.rs/), the version from your package manager is too old)
+ - a C compiler (any will do, [the build script](https://docs.rs/cc/latest/cc/#compile-time-requirements) will find it automatically)
+ - (on linux) `libasound2-dev` and `libudev-dev`
 
 Run
 ```sh

shrooms-vb-core

@@ -1 +1 @@
-Subproject commit b2412d94873222f2060de7a29e195aba6ef02f29
+Subproject commit ecbd103917315e3aa24fd2a682208f5548ec5d1b

src/app.rs

@@ -1,9 +1,9 @@
 use std::{collections::HashSet, num::NonZero, sync::Arc, thread, time::Duration};
 
 use egui::{
-    ahash::{HashMap, HashMapExt},
     Context, FontData, FontDefinitions, FontFamily, IconData, TextWrapMode, ViewportBuilder,
     ViewportCommand, ViewportId, ViewportInfo,
+    ahash::{HashMap, HashMapExt},
 };
 use gilrs::{EventType, Gilrs};
 use tracing::{error, warn};
@@ -92,7 +92,8 @@ impl Application {
 
     fn open(&mut self, event_loop: &ActiveEventLoop, window: Box<dyn AppWindow>) {
         let viewport_id = window.viewport_id();
-        if self.viewports.contains_key(&viewport_id) {
+        if let Some(viewport) = self.viewports.get(&viewport_id) {
+            viewport.window.focus_window();
             return;
         }
         self.viewports.insert(

src/audio.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
 use itertools::Itertools;
 use rubato::{FftFixedInOut, Resampler};

src/controller.rs

@@ -1,6 +1,6 @@
 use std::sync::{Arc, RwLock};
 
-use gilrs::{ev::Code, Event as GamepadEvent, EventType, GamepadId};
+use gilrs::{Event as GamepadEvent, EventType, GamepadId, ev::Code};
 use winit::{
     event::{ElementState, KeyEvent},
     keyboard::PhysicalKey,

src/emulator.rs

@@ -5,9 +5,9 @@ use std::{
     io::{Read, Seek, SeekFrom, Write},
     path::{Path, PathBuf},
     sync::{
+        Arc, Weak,
         atomic::{AtomicBool, Ordering},
         mpsc::{self, RecvError, TryRecvError},
-        Arc, Weak,
     },
 };
 
@@ -22,7 +22,7 @@ use crate::{
     graphics::TextureSink,
     memory::{MemoryRange, MemoryRegion},
 };
-use shrooms_vb_core::{Sim, StopReason, EXPECTED_FRAME_SIZE};
+use shrooms_vb_core::{EXPECTED_FRAME_SIZE, Sim, StopReason};
 pub use shrooms_vb_core::{VBKey, VBRegister, VBWatchpointType};
 
 mod address_set;

src/emulator/shrooms_vb_core.rs

@@ -1,6 +1,6 @@
 use std::{ffi::c_void, ptr, slice};
 
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use bitflags::bitflags;
 use num_derive::{FromPrimitive, ToPrimitive};
 use serde::{Deserialize, Serialize};
@@ -91,7 +91,7 @@ type OnWrite = extern "C" fn(
 ) -> c_int;
 
 #[link(name = "vb")]
-extern "C" {
+unsafe extern "C" {
     #[link_name = "vbEmulate"]
     fn vb_emulate(sim: *mut VB, cycles: *mut u32) -> c_int;
     #[link_name = "vbEmulateEx"]
@@ -170,7 +170,7 @@ extern "C" {
     fn vb_write(sim: *mut VB, address: u32, _type: VBDataType, value: i32) -> i32;
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn on_frame(sim: *mut VB) -> c_int {
     // SAFETY: the *mut VB owns its userdata.
     // There is no way for the userdata to be null or otherwise invalid.
@@ -179,7 +179,7 @@ extern "C" fn on_frame(sim: *mut VB) -> c_int {
     1
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn on_execute(sim: *mut VB, address: u32, _code: *const u16, _length: c_int) -> c_int {
     // SAFETY: the *mut VB owns its userdata.
     // There is no way for the userdata to be null or otherwise invalid.
@@ -196,14 +196,10 @@ extern "C" fn on_execute(sim: *mut VB, address: u32, _code: *const u16, _length:
         stopped = true;
     }
 
-    if stopped {
-        1
-    } else {
-        0
-    }
+    if stopped { 1 } else { 0 }
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn on_read(
     sim: *mut VB,
     address: u32,
@@ -229,7 +225,7 @@ extern "C" fn on_read(
     0
 }
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 extern "C" fn on_write(
     sim: *mut VB,
     address: u32,

src/gdbserver.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use registers::REGISTERS;
 use request::{Request, RequestKind, RequestSource};
 use response::Response;
@@ -12,7 +12,7 @@ use tokio::{
     pin, select,
     sync::{mpsc, oneshot},
 };
-use tracing::{debug, enabled, error, info, Level};
+use tracing::{Level, debug, enabled, error, info};
 
 use crate::emulator::{
     DebugEvent, DebugStopReason, EmulatorClient, EmulatorCommand, SimId, VBWatchpointType,

src/gdbserver/request.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use atoi::FromRadix16;
 use tokio::io::{AsyncRead, AsyncReadExt as _};
 

src/graphics.rs

@@ -1,12 +1,13 @@
 use std::{
     sync::{
+        Arc, Mutex, MutexGuard,
         atomic::{AtomicU64, Ordering},
-        mpsc, Arc, Mutex, MutexGuard,
+        mpsc,
     },
     thread,
 };
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use itertools::Itertools as _;
 use wgpu::{
     Device, Extent3d, ImageCopyTexture, ImageDataLayout, Origin3d, Queue, Texture,

src/images.rs

@@ -7,9 +7,9 @@ use std::{
 };
 
 use egui::{
+    Color32, ColorImage, TextureHandle, TextureOptions,
     epaint::ImageDelta,
     load::{LoadError, SizedTexture, TextureLoader, TexturePoll},
-    Color32, ColorImage, TextureHandle, TextureOptions,
 };
 use tokio::{sync::mpsc, time::timeout};
 

src/input.rs

@@ -1,6 +1,6 @@
 use std::{
     cmp::Ordering,
-    collections::{hash_map::Entry, HashMap, HashSet},
+    collections::{HashMap, HashSet, hash_map::Entry},
     fmt::Display,
     str::FromStr,
     sync::{Arc, Mutex, RwLock},
@@ -8,7 +8,7 @@ use std::{
 
 use anyhow::anyhow;
 use egui::{Key, KeyboardShortcut, Modifiers};
-use gilrs::{ev::Code, Axis, Button, Gamepad, GamepadId};
+use gilrs::{Axis, Button, Gamepad, GamepadId, ev::Code};
 use serde::{Deserialize, Serialize};
 use winit::keyboard::{KeyCode, PhysicalKey};
 

src/main.rs

@@ -3,13 +3,13 @@
 
 use std::{path::PathBuf, process, time::SystemTime};
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use app::Application;
 use clap::Parser;
 use emulator::EmulatorBuilder;
 use thread_priority::{ThreadBuilder, ThreadPriority};
 use tracing::error;
-use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer};
+use tracing_subscriber::{EnvFilter, Layer, layer::SubscriberExt, util::SubscriberInitExt};
 use winit::event_loop::{ControlFlow, EventLoop};
 
 mod app;

src/memory.rs

@@ -2,7 +2,7 @@ use std::{
     collections::HashMap,
     fmt::Debug,
     iter::FusedIterator,
-    sync::{atomic::AtomicU64, Arc, Mutex, RwLock, RwLockReadGuard, TryLockError, Weak},
+    sync::{Arc, Mutex, RwLock, RwLockReadGuard, TryLockError, Weak, atomic::AtomicU64},
 };
 
 use bytemuck::BoxBytes;
@@ -223,7 +223,7 @@ impl MemoryRegion {
                 .iter()
                 .map(|i| i.load(std::sync::atomic::Ordering::Acquire))
                 .enumerate()
-                .max_by_key(|(_, gen)| *gen)
+                .max_by_key(|(_, g)| *g)
                 .map(|(i, _)| i)
                 .unwrap();
             let inner = match self.bufs[newest_index].try_read() {

src/persistence.rs

@@ -1,6 +1,6 @@
 use std::{fs, path::PathBuf};
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use directories::ProjectDirs;
 use serde::{Deserialize, Serialize};
 

src/window/game.rs

@@ -7,17 +7,17 @@ use crate::{
     persistence::Persistence,
 };
 use egui::{
-    menu, Align2, Button, CentralPanel, Color32, Context, Direction, Frame, TopBottomPanel, Ui,
-    Vec2, ViewportBuilder, ViewportCommand, ViewportId, Window,
+    Align2, Button, CentralPanel, Color32, Context, Direction, Frame, TopBottomPanel, Ui, Vec2,
+    ViewportBuilder, ViewportCommand, ViewportId, Window, menu,
 };
 use egui_toast::{Toast, Toasts};
 use serde::{Deserialize, Serialize};
 use winit::event_loop::EventLoopProxy;
 
 use super::{
+    AppWindow,
     game_screen::{DisplayMode, GameScreen},
     utils::UiExt as _,
-    AppWindow,
 };
 
 const COLOR_PRESETS: [[Color32; 2]; 3] = [

src/window/game_screen.rs

@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use egui::{Color32, Rgba, Vec2, Widget};
 use serde::{Deserialize, Serialize};
-use wgpu::{util::DeviceExt as _, BindGroup, BindGroupLayout, Buffer, RenderPipeline};
+use wgpu::{BindGroup, BindGroupLayout, Buffer, RenderPipeline, util::DeviceExt as _};
 
 use crate::graphics::TextureSink;
 

src/window/utils.rs

@@ -6,9 +6,9 @@ use std::{
 
 use atoi::FromRadix16;
 use egui::{
-    ecolor::HexColor, Align, Color32, CursorIcon, Event, Frame, Key, Layout, Margin, Rect,
-    Response, RichText, Rounding, Sense, Shape, Stroke, TextEdit, Ui, UiBuilder, Vec2, Widget,
-    WidgetText,
+    Align, Color32, CursorIcon, Event, Frame, Key, Layout, Margin, Rect, Response, RichText,
+    Rounding, Sense, Shape, Stroke, TextEdit, Ui, UiBuilder, Vec2, Widget, WidgetText,
+    ecolor::HexColor,
 };
 use num_traits::{CheckedAdd, CheckedSub, One};
 
@@ -119,20 +119,20 @@ pub trait Number:
 {
 }
 impl<
-        T: Copy
-            + One
-            + CheckedAdd
-            + CheckedSub
-            + Eq
-            + Ord
-            + Display
-            + FromStr
-            + FromRadix16
-            + UpperHex
-            + Send
-            + Sync
-            + 'static,
-    > Number for T
+    T: Copy
+        + One
+        + CheckedAdd
+        + CheckedSub
+        + Eq
+        + Ord
+        + Display
+        + FromStr
+        + FromRadix16
+        + UpperHex
+        + Send
+        + Sync
+        + 'static,
+> Number for T
 {
 }
 

src/window/vip/bgmap.rs

@@ -11,8 +11,8 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt},
         AppWindow,
+        utils::{NumberEdit, UiExt},
     },
 };
 

src/window/vip/chardata.rs

@@ -12,8 +12,8 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt as _},
         AppWindow,
+        utils::{NumberEdit, UiExt as _},
     },
 };
 

src/window/vip/framebuffer.rs

@@ -11,8 +11,8 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt as _},
         AppWindow,
+        utils::{NumberEdit, UiExt as _},
     },
 };
 

src/window/vip/object.rs

@@ -11,8 +11,8 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt as _},
         AppWindow,
+        utils::{NumberEdit, UiExt as _},
     },
 };
 

src/window/vip/registers.rs

@@ -10,8 +10,8 @@ use crate::{
     emulator::SimId,
     memory::{MemoryClient, MemoryRef, MemoryValue, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt},
         AppWindow,
+        utils::{NumberEdit, UiExt},
     },
 };
 

src/window/vip/utils.rs

@@ -124,7 +124,7 @@ impl CellData {
     }
 
     pub fn update(&self, source: &mut u16) -> bool {
-        let new_value = (self.palette_index as u16) << 14
+        let new_value = ((self.palette_index as u16) << 14)
             | if self.hflip { 0x2000 } else { 0x0000 }
             | if self.vflip { 0x1000 } else { 0x0000 }
             | (self.char_index as u16 & 0x07ff)
@@ -222,12 +222,12 @@ impl Widget for CharacterGrid<'_> {
             for x in (1..grid_width_cells).map(|i| (i as f32) * cell_size) {
                 let p1 = (res.rect.min.x + x, res.rect.min.y).into();
                 let p2 = (res.rect.min.x + x, res.rect.max.y).into();
-                painter.line(vec![p1, p2], stroke);
+                painter.line_segment([p1, p2], stroke);
             }
             for y in (1..grid_height_cells).map(|i| (i as f32) * cell_size) {
                 let p1 = (res.rect.min.x, res.rect.min.y + y).into();
                 let p2 = (res.rect.max.x, res.rect.min.y + y).into();
-                painter.line(vec![p1, p2], stroke);
+                painter.line_segment([p1, p2], stroke);
             }
         }
         if let Some(selected) = self.selected {

src/window/vip/world.rs

@@ -6,8 +6,8 @@ use egui::{
 };
 use egui_extras::{Column, Size, StripBuilder, TableBuilder};
 use fixed::{
-    types::extra::{U3, U9},
     FixedI32,
+    types::extra::{U3, U9},
 };
 use num_derive::{FromPrimitive, ToPrimitive};
 use num_traits::{FromPrimitive, ToPrimitive};
@@ -17,12 +17,12 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryRef, MemoryView},
     window::{
-        utils::{NumberEdit, UiExt as _},
         AppWindow,
+        utils::{NumberEdit, UiExt as _},
     },
 };
 
-use super::utils::{self, shade, CellData, Object};
+use super::utils::{self, CellData, Object, shade};
 
 pub struct WorldWindow {
     sim_id: SimId,
@@ -33,6 +33,7 @@ pub struct WorldWindow {
     index: usize,
     param_index: usize,
     generic_palette: bool,
+    show_extents: bool,
     params: ImageParams<WorldParams>,
     scale: f32,
 }
@@ -57,6 +58,7 @@ impl WorldWindow {
             index: params.index,
             param_index: 0,
             generic_palette: params.generic_palette,
+            show_extents: false,
             params,
             scale: 1.0,
         }
@@ -413,6 +415,7 @@ impl WorldWindow {
                     ui.add(slider);
                 });
                 ui.checkbox(&mut self.generic_palette, "Generic palette");
+                ui.checkbox(&mut self.show_extents, "Show extents");
             });
         });
         self.params.write(WorldParams {
@@ -426,7 +429,82 @@ impl WorldWindow {
         let image = Image::new("vip://world")
             .fit_to_original_size(self.scale)
             .texture_options(TextureOptions::NEAREST);
-        ui.add(image);
+        let res = ui.add(image);
+        if self.show_extents {
+            let world = {
+                let worlds = self.worlds.borrow();
+                let data = worlds.read(self.index);
+                World::parse(&data)
+            };
+            if world.header.mode == WorldMode::Object {
+                return;
+            }
+
+            let lx1 = (world.dst_x - world.dst_parallax) as f32 * self.scale;
+            let lx2 = lx1 + world.width as f32 * self.scale;
+            let rx1 = (world.dst_x + world.dst_parallax) as f32 * self.scale;
+            let rx2 = rx1 + world.width as f32 * self.scale;
+            let y1 = world.dst_y as f32 * self.scale;
+            let y2 = y1 + world.height as f32 * self.scale;
+
+            let left_color = self.params.left_color;
+            let right_color = self.params.right_color;
+            let both_color = Color32::from_rgb(
+                left_color.r() + right_color.r(),
+                left_color.g() + right_color.g(),
+                left_color.b() + right_color.b(),
+            );
+
+            let painter = ui.painter();
+            let draw_rect = |x1: f32, x2: f32, color: Color32| {
+                painter.line(
+                    vec![
+                        res.rect.min + (x1, y1).into(),
+                        res.rect.min + (x2, y1).into(),
+                        res.rect.min + (x2, y2).into(),
+                        res.rect.min + (x1, y2).into(),
+                        res.rect.min + (x1, y1).into(),
+                    ],
+                    (2.0, color),
+                )
+            };
+
+            match (world.header.lon, world.header.ron) {
+                (false, false) => {}
+                (true, false) => {
+                    draw_rect(lx1, lx2, left_color);
+                }
+                (false, true) => {
+                    draw_rect(rx1, rx2, right_color);
+                }
+                (true, true) if world.dst_parallax == 0 => {
+                    draw_rect(lx1, lx2, both_color);
+                }
+                (true, true) => {
+                    draw_rect(lx1, lx2, left_color);
+                    draw_rect(rx1, rx2, right_color);
+                    let (x1, x2) = if world.dst_parallax < 0 {
+                        (lx1, rx2)
+                    } else {
+                        (rx1, lx2)
+                    };
+                    painter.line_segment(
+                        [
+                            res.rect.min + (x1, y1).into(),
+                            res.rect.min + (x2 + 1.0, y1).into(),
+                        ],
+                        (2.0, both_color),
+                    );
+                    painter.line_segment(
+                        [
+                            res.rect.min + (x1, y2).into(),
+                            res.rect.min + (x2 + 1.0, y2).into(),
+                        ],
+                        (2.0, both_color),
+                    );
+                }
+            }
+        }
     }
 }
 
@@ -442,7 +520,7 @@ impl AppWindow for WorldWindow {
     fn initial_viewport(&self) -> ViewportBuilder {
         ViewportBuilder::default()
             .with_title(format!("Worlds ({})", self.sim_id))
-            .with_inner_size((640.0, 500.0))
+            .with_inner_size((640.0, 520.0))
     }
 
     fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
@@ -870,7 +948,7 @@ impl WorldHeader {
         let new_value = (*source & 0x0030)
             | if self.lon { 0x8000 } else { 0x0000 }
             | if self.ron { 0x4000 } else { 0x0000 }
-            | self.mode.to_u16().unwrap() << 12
+            | (self.mode.to_u16().unwrap() << 12)
             | ((self.scx as u16) << 10)
             | ((self.scy as u16) << 8)
             | if self.over { 0x0080 } else { 0x0000 }