use egui 0.25.0 (#435)

Co-authored-by: Paul DE TEMMERMAN <[email protected]>
asny · Jan 17, 2024 · a6cddda · a6cddda
1 parent cccdef0
commit a6cddda
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,13 +23,13 @@ headless = ["glutin_029"] # Headless rendering
 egui-gui = ["egui_glow", "egui", "getrandom"] # Additional GUI features 
 
 [dependencies]
-glow = "0.12"
+glow = "0.13.0"
 cgmath = "0.18"
 three-d-asset = {version = "0.6"}
 thiserror = "1"
 winit = {version = "0.28", optional = true}
-egui = { version = "0.22", optional = true }
-egui_glow = { version = "0.22", optional = true }
+egui = { version = "0.25.0", optional = true }
+egui_glow = { version = "0.25.0", optional = true }
 getrandom = { version = "0.2", features = ["js"], optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]

diff --git a/src/gui/egui_gui.rs b/src/gui/egui_gui.rs
@@ -73,7 +73,6 @@ impl GUI {
                         + viewport.height as f32 / device_pixel_ratio as f32,
                 },
             }),
-            pixels_per_point: Some(device_pixel_ratio as f32),
             time: Some(accumulated_time_in_ms * 0.001),
             modifiers: (&self.modifiers).into(),
             events: events
@@ -90,6 +89,7 @@ impl GUI {
                                 pressed: true,
                                 modifiers: modifiers.into(),
                                 repeat: false,
+                                physical_key: None,
                             })
                         } else {
                             None
@@ -106,6 +106,7 @@ impl GUI {
                                 pressed: false,
                                 modifiers: modifiers.into(),
                                 repeat: false,
+                                physical_key: None,
                             })
                         } else {
                             None
@@ -252,8 +253,8 @@ impl GUI {
             .borrow_mut()
             .take()
             .expect("need to call GUI::update before GUI::render");
-        let clipped_meshes = self.egui_context.tessellate(output.shapes);
         let scale = self.egui_context.pixels_per_point();
+        let clipped_meshes = self.egui_context.tessellate(output.shapes, scale);
         self.painter.borrow_mut().paint_and_update_textures(
             [self.viewport.width, self.viewport.height],
             scale,