janis/vidya
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

use scale_factor for egui

Browse source
This commit is contained in:
Janis 2025-01-14 18:53:31 +01:00
parent d623b8fc46
commit 7640cf053b
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/game/src/main.rs
View file

@ -16,6 +16,7 @@ struct WindowState {
window: Window, window: Window,
egui_platform: egui_winit_platform::Platform, egui_platform: egui_winit_platform::Platform,
demo_app: egui_demo_lib::DemoWindows, demo_app: egui_demo_lib::DemoWindows,
scale_factor: f64,
} }
struct WinitState { struct WinitState {
@ -121,16 +122,18 @@ impl WinitState {
window.window_handle().expect("window handle"), window.window_handle().expect("window handle"),
); );
let scale_factor = window.scale_factor();
self.windows2.insert( self.windows2.insert(
window_id, window_id,
WindowState { WindowState {
window, window,
scale_factor,
demo_app: egui_demo_lib::DemoWindows::default(), demo_app: egui_demo_lib::DemoWindows::default(),
egui_platform: egui_winit_platform::Platform::new( egui_platform: egui_winit_platform::Platform::new(
egui_winit_platform::PlatformDescriptor { egui_winit_platform::PlatformDescriptor {
physical_width: size.width, physical_width: size.width,
physical_height: size.height, physical_height: size.height,
scale_factor: 1.0, scale_factor,
..Default::default() ..Default::default()
}, },
), ),
@ -229,6 +232,11 @@ impl ApplicationHandler for WinitState {
winit::event::WindowEvent::RedrawRequested => { winit::event::WindowEvent::RedrawRequested => {
self.handle_draw_request(window_id); self.handle_draw_request(window_id);
} }
winit::event::WindowEvent::ScaleFactorChanged { scale_factor, .. } => {
if let Some(window) = self.windows2.get_mut(&window_id) {
window.scale_factor = scale_factor;
}
}
_ => {} // unhandled event _ => {} // unhandled event
} }
} }

3
crates/renderer/src/egui.rs
View file

@ -609,6 +609,7 @@ pub fn egui_pass(
let pipeline = egui_state.pipeline.clone(); let pipeline = egui_state.pipeline.clone();
let pipeline_layout = egui_state.pipeline_layout.clone(); let pipeline_layout = egui_state.pipeline_layout.clone();
let descriptor_set = egui_state.descriptor_set; let descriptor_set = egui_state.descriptor_set;
let screen_rect = egui.screen_rect();
move |ctx: &RenderContext| -> crate::Result<()> { move |ctx: &RenderContext| -> crate::Result<()> {
let cmd = &ctx.cmd; let cmd = &ctx.cmd;
@ -717,7 +718,7 @@ pub fn egui_pass(
vk::ShaderStageFlags::VERTEX, vk::ShaderStageFlags::VERTEX,
0, 0,
bytemuck::cast_slice( bytemuck::cast_slice(
&[target.width() as f32, target.height() as f32].map(|f| f.to_bits()), &[screen_rect.width(), screen_rect.height()].map(|f| f.to_bits()),
), ),
); );
cmd.bind_descriptor_sets( cmd.bind_descriptor_sets(