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

Update to egui 0.22 #2195

Merged
merged 1 commit into from
May 24, 2023
Merged

Update to egui 0.22 #2195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 30 additions & 20 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 8 additions & 17 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ clap = "4.0"
comfy-table = { version = "6.1", default-features = false }
crossbeam = "0.8"
ctrlc = { version = "3.0", features = ["termination"] }
ecolor = "0.21.0"
eframe = { version = "0.21.3", default-features = false }
egui = { version = "0.21.0", features = ["extra_debug_asserts", "log"] }
egui_extras = { version = "0.21.0", features = ["log"] }
egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", rev = "cd85328bc727ec9cd25d2e52583ec4ec2cff1381" }
egui-wgpu = "0.21.0"
emath = "0.21.0"
ecolor = "0.22.0"
eframe = { version = "0.22.0", default-features = false }
egui = { version = "0.22.0", features = ["extra_debug_asserts", "log"] }
egui_extras = { version = "0.22.0", features = ["log"] }
egui_tiles = { version = "0.1" }
egui-wgpu = "0.22.0"
emath = "0.22.0"
enumset = "1.0.12"
epaint = "0.21.0"
epaint = "0.22.0"
glam = "0.22"
gltf = "1.1"
half = "2.0"
Expand Down Expand Up @@ -126,15 +126,6 @@ debug = true
# As a last resport, patch with a commit to our own repository.
# ALWAYS document what PR the commit hash is part of, or when it was merged into the upstream trunk.

# TODO(andreas/emilk): Update to a stable egui version
# wgpu 0.16 support, device configuration dependent on adapter, some additions to help egui_tiles, egui::Modifiers::contains, better error reporting for web, wasm-bindgen update, `NativeOptions::app_id`
ecolor = { git = "https://github.com/emilk/egui", rev = "bb252e2" }
eframe = { git = "https://github.com/emilk/egui", rev = "bb252e2" }
egui = { git = "https://github.com/emilk/egui", rev = "bb252e2" }
egui-wgpu = { git = "https://github.com/emilk/egui", rev = "bb252e2" }
egui_extras = { git = "https://github.com/emilk/egui", rev = "bb252e2" }
emath = { git = "https://github.com/emilk/egui", rev = "bb252e2" }

# TODO(andreas): Either work around this issue in wgpu-egui (never discard command buffers) or wait for wgpu patch release.
# Fix for command buffer dropping crash https://github.com/gfx-rs/wgpu/pull/3726
wgpu = { git = "https://github.com/rerun-io/wgpu", rev = "de497aeda152a3515bac5eb4bf1b17f1757b9dac" }
Expand Down