egui 0.26 (#574)

BVE-Reborn · Feb 8, 2024 · c7c2d85 · c7c2d85
1 parent 86bc4d2
commit c7c2d85
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -50,6 +50,7 @@ Per Keep a Changelog there are 6 main categories of changes:
 - rend3: Update to winit 0.29.4 @pillowtrucker
 - rend3-framework: Consolidate many arguments into single `SetupContext`, `EventContext`, and `RedrawContext` structs. @cwfitzgerald
 - rend3-framework: Surfaces are now handled amost entirely by the framework, including acquiring frames and presenting. Redraws now happen in a dedicated `handle_redraw` callback. @cwfitzgerald
+- rend3-egui: Update to egui 0.26. @Elabajaba
 
 ### Fixes
 - Fixed renderpass compatibility checks to avoid issues when RODS is used. @OptimisticPeach

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -20,9 +20,9 @@ path = "src/main.rs"
 # error handling
 anyhow = "1"
 # The egui immediate mode gui library
-egui = {git = "https://github.com/emilk/egui.git", branch="master"}
+egui = "0.26"
 # Winit integration with egui (turn off the clipboard feature)
-egui-winit = { git = "https://github.com/emilk/egui.git", branch="master", default-features = false, features = ["links", "wayland"] }
+egui-winit = { version = "0.26", default-features = false, features = ["links", "wayland"] }
 # logging
 env_logger = { version = "0.10", default-features = false, features = ["auto-color", "humantime"] }
 # Linear algebra library

diff --git a/rend3-egui/Cargo.toml b/rend3-egui/Cargo.toml
@@ -12,8 +12,8 @@ categories = ["game-development", "graphics", "rendering", "rendering::engine",
 rust-version = "1.71"
 
 [dependencies]
-egui = {git = "https://github.com/emilk/egui.git", branch="master"}
-egui-wgpu = {git = "https://github.com/emilk/egui.git", branch="master"}
+egui = "0.26"
+egui-wgpu = "0.26"
 glam = "0.24"
 rend3 = { version = "^0.3.0", path = "../rend3" }
 wgpu = "0.19.0"

diff --git a/rend3-egui/src/lib.rs b/rend3-egui/src/lib.rs
@@ -15,7 +15,7 @@ use wgpu::TextureFormat;
 
 pub struct EguiRenderRoutine {
  pub internal: egui_wgpu::Renderer,
- screen_descriptor: egui_wgpu::renderer::ScreenDescriptor,
+ screen_descriptor: egui_wgpu::ScreenDescriptor,
  textures_to_free: Vec<egui::TextureId>,
 }
 
@@ -36,7 +36,7 @@ impl EguiRenderRoutine {
 
  Self {
  internal: rpass,
- screen_descriptor: egui_wgpu::renderer::ScreenDescriptor {
+ screen_descriptor: egui_wgpu::ScreenDescriptor {
  size_in_pixels: [width, height],
  pixels_per_point: scale_factor,
  },
@@ -45,7 +45,7 @@ impl EguiRenderRoutine {
  }
 
  pub fn resize(&mut self, new_width: u32, new_height: u32, new_scale_factor: f32) {
- self.screen_descriptor = egui_wgpu::renderer::ScreenDescriptor {
+ self.screen_descriptor = egui_wgpu::ScreenDescriptor {
  size_in_pixels: [new_width, new_height],
  pixels_per_point: new_scale_factor,
  };