Skip to content

Commit

Permalink
Update egui (#6535)
Browse files Browse the repository at this point in the history
### What
* Contains emilk/egui#4649
* Closes #6527

### Checklist
* [x] I have read and agree to [Contributor
Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and
the [Code of
Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md)
* [x] I've included a screenshot or gif (if applicable)
* [x] I have tested the web demo (if applicable):
* Using examples from latest `main` build:
[rerun.io/viewer](https://rerun.io/viewer/pr/6535?manifest_url=https://app.rerun.io/version/main/examples_manifest.json)
* Using full set of examples from `nightly` build:
[rerun.io/viewer](https://rerun.io/viewer/pr/6535?manifest_url=https://app.rerun.io/version/nightly/examples_manifest.json)
* [x] The PR title and labels are set such as to maximize their
usefulness for the next release's CHANGELOG
* [x] If applicable, add a new check to the [release
checklist](https://github.com/rerun-io/rerun/blob/main/tests/python/release_checklist)!

- [PR Build Summary](https://build.rerun.io/pr/6535)
- [Recent benchmark results](https://build.rerun.io/graphs/crates.html)
- [Wasm size tracking](https://build.rerun.io/graphs/sizes.html)

To run all checks from `main`, comment on the PR with `@rerun-bot
full-check`.
  • Loading branch information
emilk authored Jun 11, 2024
1 parent e890311 commit 8c48423
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
20 changes: 10 additions & 10 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1564,7 +1564,7 @@ checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
[[package]]
name = "ecolor"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=2545939c150379b85517de691da56a46f5ee0d1d#2545939c150379b85517de691da56a46f5ee0d1d"
source = "git+https://github.com/emilk/egui.git?rev=ca36f3df6319cbba0e2ab4366d51d97caa9e85b6#ca36f3df6319cbba0e2ab4366d51d97caa9e85b6"
dependencies = [
"bytemuck",
"emath",
Expand All @@ -1574,7 +1574,7 @@ dependencies = [
[[package]]
name = "eframe"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=2545939c150379b85517de691da56a46f5ee0d1d#2545939c150379b85517de691da56a46f5ee0d1d"
source = "git+https://github.com/emilk/egui.git?rev=ca36f3df6319cbba0e2ab4366d51d97caa9e85b6#ca36f3df6319cbba0e2ab4366d51d97caa9e85b6"
dependencies = [
"ahash",
"bytemuck",
Expand Down Expand Up @@ -1610,7 +1610,7 @@ dependencies = [
[[package]]
name = "egui"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=2545939c150379b85517de691da56a46f5ee0d1d#2545939c150379b85517de691da56a46f5ee0d1d"
source = "git+https://github.com/emilk/egui.git?rev=ca36f3df6319cbba0e2ab4366d51d97caa9e85b6#ca36f3df6319cbba0e2ab4366d51d97caa9e85b6"
dependencies = [
"accesskit",
"ahash",
Expand All @@ -1627,7 +1627,7 @@ dependencies = [
[[package]]
name = "egui-wgpu"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=2545939c150379b85517de691da56a46f5ee0d1d#2545939c150379b85517de691da56a46f5ee0d1d"
source = "git+https://github.com/emilk/egui.git?rev=ca36f3df6319cbba0e2ab4366d51d97caa9e85b6#ca36f3df6319cbba0e2ab4366d51d97caa9e85b6"
dependencies = [
"ahash",
"bytemuck",
Expand All @@ -1646,7 +1646,7 @@ dependencies = [
[[package]]
name = "egui-winit"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=2545939c150379b85517de691da56a46f5ee0d1d#2545939c150379b85517de691da56a46f5ee0d1d"
source = "git+https://github.com/emilk/egui.git?rev=ca36f3df6319cbba0e2ab4366d51d97caa9e85b6#ca36f3df6319cbba0e2ab4366d51d97caa9e85b6"
dependencies = [
"accesskit_winit",
"ahash",
Expand Down Expand Up @@ -1686,7 +1686,7 @@ dependencies = [
[[package]]
name = "egui_extras"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=2545939c150379b85517de691da56a46f5ee0d1d#2545939c150379b85517de691da56a46f5ee0d1d"
source = "git+https://github.com/emilk/egui.git?rev=ca36f3df6319cbba0e2ab4366d51d97caa9e85b6#ca36f3df6319cbba0e2ab4366d51d97caa9e85b6"
dependencies = [
"ahash",
"egui",
Expand All @@ -1702,7 +1702,7 @@ dependencies = [
[[package]]
name = "egui_glow"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=2545939c150379b85517de691da56a46f5ee0d1d#2545939c150379b85517de691da56a46f5ee0d1d"
source = "git+https://github.com/emilk/egui.git?rev=ca36f3df6319cbba0e2ab4366d51d97caa9e85b6#ca36f3df6319cbba0e2ab4366d51d97caa9e85b6"
dependencies = [
"ahash",
"bytemuck",
Expand All @@ -1720,7 +1720,7 @@ dependencies = [
[[package]]
name = "egui_plot"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=2545939c150379b85517de691da56a46f5ee0d1d#2545939c150379b85517de691da56a46f5ee0d1d"
source = "git+https://github.com/emilk/egui.git?rev=ca36f3df6319cbba0e2ab4366d51d97caa9e85b6#ca36f3df6319cbba0e2ab4366d51d97caa9e85b6"
dependencies = [
"ahash",
"egui",
Expand Down Expand Up @@ -1763,7 +1763,7 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
name = "emath"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=2545939c150379b85517de691da56a46f5ee0d1d#2545939c150379b85517de691da56a46f5ee0d1d"
source = "git+https://github.com/emilk/egui.git?rev=ca36f3df6319cbba0e2ab4366d51d97caa9e85b6#ca36f3df6319cbba0e2ab4366d51d97caa9e85b6"
dependencies = [
"bytemuck",
"serde",
Expand Down Expand Up @@ -1864,7 +1864,7 @@ dependencies = [
[[package]]
name = "epaint"
version = "0.27.2"
source = "git+https://github.com/emilk/egui.git?rev=2545939c150379b85517de691da56a46f5ee0d1d#2545939c150379b85517de691da56a46f5ee0d1d"
source = "git+https://github.com/emilk/egui.git?rev=ca36f3df6319cbba0e2ab4366d51d97caa9e85b6#ca36f3df6319cbba0e2ab4366d51d97caa9e85b6"
dependencies = [
"ab_glyph",
"ahash",
Expand Down
14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -454,13 +454,13 @@ missing_errors_doc = "allow"
# 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.

ecolor = { git = "https://github.com/emilk/egui.git", rev = "2545939c150379b85517de691da56a46f5ee0d1d" } # egui master 2024-06-06
eframe = { git = "https://github.com/emilk/egui.git", rev = "2545939c150379b85517de691da56a46f5ee0d1d" } # egui master 2024-06-06
egui = { git = "https://github.com/emilk/egui.git", rev = "2545939c150379b85517de691da56a46f5ee0d1d" } # egui master 2024-06-06
egui_extras = { git = "https://github.com/emilk/egui.git", rev = "2545939c150379b85517de691da56a46f5ee0d1d" } # egui master 2024-06-06
egui_plot = { git = "https://github.com/emilk/egui.git", rev = "2545939c150379b85517de691da56a46f5ee0d1d" } # egui master 2024-06-06
egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "2545939c150379b85517de691da56a46f5ee0d1d" } # egui master 2024-06-06
emath = { git = "https://github.com/emilk/egui.git", rev = "2545939c150379b85517de691da56a46f5ee0d1d" } # egui master 2024-06-06
ecolor = { git = "https://github.com/emilk/egui.git", rev = "ca36f3df6319cbba0e2ab4366d51d97caa9e85b6" } # egui master 2024-06-10
eframe = { git = "https://github.com/emilk/egui.git", rev = "ca36f3df6319cbba0e2ab4366d51d97caa9e85b6" } # egui master 2024-06-10
egui = { git = "https://github.com/emilk/egui.git", rev = "ca36f3df6319cbba0e2ab4366d51d97caa9e85b6" } # egui master 2024-06-10
egui_extras = { git = "https://github.com/emilk/egui.git", rev = "ca36f3df6319cbba0e2ab4366d51d97caa9e85b6" } # egui master 2024-06-10
egui_plot = { git = "https://github.com/emilk/egui.git", rev = "ca36f3df6319cbba0e2ab4366d51d97caa9e85b6" } # egui master 2024-06-10
egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "ca36f3df6319cbba0e2ab4366d51d97caa9e85b6" } # egui master 2024-06-10
emath = { git = "https://github.com/emilk/egui.git", rev = "ca36f3df6319cbba0e2ab4366d51d97caa9e85b6" } # egui master 2024-06-10

# Useful while developing:
# ecolor = { path = "../../egui/crates/ecolor" }
Expand Down

0 comments on commit 8c48423

Please sign in to comment.