Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

egui 0.26 #574

Merged
merged 2 commits into from
Feb 8, 2024
Merged

egui 0.26 #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4660dab
egui 0.26
Elabajaba Feb 6, 2024
449784e
changelog
Elabajaba Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions rend3-egui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions rend3-egui/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
}

Expand All @@ -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,
},
Expand All @@ -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,
};
Expand Down
Loading