Skip to content

Commit

Permalink
Update to egui 0.29 (#7530)
Browse files Browse the repository at this point in the history
### What
* https://github.com/emilk/egui/releases/tag/0.29.0

### 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/7530?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/7530?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)!
* [x] If have noted any breaking changes to the log API in
`CHANGELOG.md` and the migration guide

- [PR Build Summary](https://build.rerun.io/pr/7530)
- [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 committed Sep 27, 2024
1 parent 84003b1 commit 846478f
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 47 deletions.
71 changes: 42 additions & 29 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1776,8 +1776,9 @@ checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"

[[package]]
name = "ecolor"
version = "0.28.1"
source = "git+https://github.com/emilk/egui.git?rev=f97f85089df5e936999d5b7280e2e93e2958fac8#f97f85089df5e936999d5b7280e2e93e2958fac8"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5629649a8ae57c73f175f4a96419905a8102cfbfcbce96ea25a826bbf468e990"
dependencies = [
"bytemuck",
"emath",
Expand All @@ -1786,8 +1787,9 @@ dependencies = [

[[package]]
name = "eframe"
version = "0.28.1"
source = "git+https://github.com/emilk/egui.git?rev=f97f85089df5e936999d5b7280e2e93e2958fac8#f97f85089df5e936999d5b7280e2e93e2958fac8"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712634e63d86f5eb8e30f880bc4803b79dcc82539aec1a28fde86ed839daed24"
dependencies = [
"ahash",
"bytemuck",
Expand Down Expand Up @@ -1823,8 +1825,9 @@ dependencies = [

[[package]]
name = "egui"
version = "0.28.1"
source = "git+https://github.com/emilk/egui.git?rev=f97f85089df5e936999d5b7280e2e93e2958fac8#f97f85089df5e936999d5b7280e2e93e2958fac8"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26bab3b3572566257a497b5f87d2cccaf7f7f122d4b8b620cba0493becc7955e"
dependencies = [
"accesskit",
"ahash",
Expand All @@ -1840,8 +1843,9 @@ dependencies = [

[[package]]
name = "egui-wgpu"
version = "0.28.1"
source = "git+https://github.com/emilk/egui.git?rev=f97f85089df5e936999d5b7280e2e93e2958fac8#f97f85089df5e936999d5b7280e2e93e2958fac8"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba69456826abf572ed95b658b265c01f07a23d615d6f029eedc9ee5f13ddf788"
dependencies = [
"ahash",
"bytemuck",
Expand All @@ -1859,8 +1863,9 @@ dependencies = [

[[package]]
name = "egui-winit"
version = "0.28.1"
source = "git+https://github.com/emilk/egui.git?rev=f97f85089df5e936999d5b7280e2e93e2958fac8#f97f85089df5e936999d5b7280e2e93e2958fac8"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "642c749bf221b5a3ecae3144c98b837729d87b9fde6c39a6ad00f07b71dbee94"
dependencies = [
"accesskit_winit",
"ahash",
Expand All @@ -1878,8 +1883,9 @@ dependencies = [

[[package]]
name = "egui_commonmark"
version = "0.17.0"
source = "git+https://github.com/rerun-io/egui_commonmark?rev=7a9dc755bfa351a3796274cb8ca87129b051c084#7a9dc755bfa351a3796274cb8ca87129b051c084"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f169228b94d1c8eb9330b7ea1b5f65b1193b6bea95159c87f574ed4aff8c172"
dependencies = [
"egui",
"egui_commonmark_backend",
Expand All @@ -1889,8 +1895,9 @@ dependencies = [

[[package]]
name = "egui_commonmark_backend"
version = "0.17.0"
source = "git+https://github.com/rerun-io/egui_commonmark?rev=7a9dc755bfa351a3796274cb8ca87129b051c084#7a9dc755bfa351a3796274cb8ca87129b051c084"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcd08f95abeb137e59c9bfdd0880d362bff74a83afe13805fde7a2d014ef773d"
dependencies = [
"egui",
"egui_extras",
Expand All @@ -1899,8 +1906,9 @@ dependencies = [

[[package]]
name = "egui_extras"
version = "0.28.1"
source = "git+https://github.com/emilk/egui.git?rev=f97f85089df5e936999d5b7280e2e93e2958fac8#f97f85089df5e936999d5b7280e2e93e2958fac8"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9f1beb57a3c942fac2f058655188c79ac1cd200555e4f3684cd0c965ceb3a67"
dependencies = [
"ahash",
"egui",
Expand All @@ -1915,8 +1923,9 @@ dependencies = [

[[package]]
name = "egui_glow"
version = "0.28.1"
source = "git+https://github.com/emilk/egui.git?rev=f97f85089df5e936999d5b7280e2e93e2958fac8#f97f85089df5e936999d5b7280e2e93e2958fac8"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea182206896187f7a2fcc207a1573785fc31330cb245f6cebcf663ea933f8d20"
dependencies = [
"ahash",
"bytemuck",
Expand All @@ -1933,9 +1942,9 @@ dependencies = [

[[package]]
name = "egui_plot"
version = "0.28.1"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7acc4fe778c41b91d57e04c1a2cf5765b3dc977f9f8384d2bb2eb4254855365"
checksum = "d8dca4871c15d51aadb79534dcf51a8189e5de3426ee7b465eb7db9a0a81ea67"
dependencies = [
"ahash",
"egui",
Expand All @@ -1945,7 +1954,7 @@ dependencies = [
[[package]]
name = "egui_table"
version = "0.28.1"
source = "git+https://github.com/rerun-io/egui_table.git?rev=15be049a4eac3b9f87aa758505ebe46fd76dcef6#15be049a4eac3b9f87aa758505ebe46fd76dcef6"
source = "git+https://github.com/rerun-io/egui_table.git?rev=556d4f080a0259e5f46901733e4c3a02f7f0b06a#556d4f080a0259e5f46901733e4c3a02f7f0b06a"
dependencies = [
"egui",
"serde",
Expand All @@ -1954,8 +1963,9 @@ dependencies = [

[[package]]
name = "egui_tiles"
version = "0.9.1"
source = "git+https://github.com/rerun-io/egui_tiles?rev=b2f5e232524deed983bcad01c05f27d0e8b89d98#b2f5e232524deed983bcad01c05f27d0e8b89d98"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "239a21efdbad7d2f17bc952e6f15425c94e42ed202e924a47045c87cccf61c1a"
dependencies = [
"ahash",
"egui",
Expand Down Expand Up @@ -1988,8 +1998,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"

[[package]]
name = "emath"
version = "0.28.1"
source = "git+https://github.com/emilk/egui.git?rev=f97f85089df5e936999d5b7280e2e93e2958fac8#f97f85089df5e936999d5b7280e2e93e2958fac8"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af86c4efae11da2a3dcbb4afebd0e9ed1916345e8d187b4051d443c8bd79af93"
dependencies = [
"bytemuck",
"serde",
Expand Down Expand Up @@ -2089,8 +2100,9 @@ dependencies = [

[[package]]
name = "epaint"
version = "0.28.1"
source = "git+https://github.com/emilk/egui.git?rev=f97f85089df5e936999d5b7280e2e93e2958fac8#f97f85089df5e936999d5b7280e2e93e2958fac8"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "445e11ec86a4d85e1350578ba20b2d89977ed937f3faab32e1c3ec81d20c1842"
dependencies = [
"ab_glyph",
"ahash",
Expand All @@ -2108,8 +2120,9 @@ dependencies = [

[[package]]
name = "epaint_default_fonts"
version = "0.28.1"
source = "git+https://github.com/emilk/egui.git?rev=f97f85089df5e936999d5b7280e2e93e2958fac8#f97f85089df5e936999d5b7280e2e93e2958fac8"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5202b64bef2b2c42a7f6e2e5b40fa83dd04aa61fdb08bfd116553adc149fe47a"

[[package]]
name = "equivalent"
Expand Down
34 changes: 17 additions & 17 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -107,31 +107,31 @@ ewebsock = "0.6.0"
re_math = "0.20.0"

# egui-crates:
ecolor = "0.28.1"
eframe = { version = "0.28.1", default-features = false, features = [
ecolor = "0.29.0"
eframe = { version = "0.29.0", default-features = false, features = [
"accesskit",
"default_fonts",
"puffin",
"wayland",
"x11",
] }
egui = { version = "0.28.1", features = [
egui = { version = "0.29.0", features = [
"callstack",
"log",
"puffin",
"rayon",
] }
egui_commonmark = { version = "0.17", default-features = false }
egui_extras = { version = "0.28.1", features = [
egui_commonmark = { version = "0.18", default-features = false }
egui_extras = { version = "0.29.0", features = [
"http",
"image",
"puffin",
"serde",
] }
egui_plot = "0.28.1"
egui_tiles = "0.9.1"
egui-wgpu = "0.28.1"
emath = "0.28.1"
egui_plot = "0.29.0"
egui_tiles = "0.10.0"
egui-wgpu = "0.29.0"
emath = "0.29.0"

# All of our direct external dependencies should be found here:
ahash = "0.8"
Expand Down Expand Up @@ -514,12 +514,12 @@ 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 = "f97f85089df5e936999d5b7280e2e93e2958fac8" } # egui master 2024-09-25
eframe = { git = "https://github.com/emilk/egui.git", rev = "f97f85089df5e936999d5b7280e2e93e2958fac8" } # egui master 2024-09-25
egui = { git = "https://github.com/emilk/egui.git", rev = "f97f85089df5e936999d5b7280e2e93e2958fac8" } # egui master 2024-09-25
egui_extras = { git = "https://github.com/emilk/egui.git", rev = "f97f85089df5e936999d5b7280e2e93e2958fac8" } # egui master 2024-09-25
egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "f97f85089df5e936999d5b7280e2e93e2958fac8" } # egui master 2024-09-25
emath = { git = "https://github.com/emilk/egui.git", rev = "f97f85089df5e936999d5b7280e2e93e2958fac8" } # egui master 2024-09-25
# ecolor = { git = "https://github.com/emilk/egui.git", rev = "f97f85089df5e936999d5b7280e2e93e2958fac8" } # egui master 2024-09-25
# eframe = { git = "https://github.com/emilk/egui.git", rev = "f97f85089df5e936999d5b7280e2e93e2958fac8" } # egui master 2024-09-25
# egui = { git = "https://github.com/emilk/egui.git", rev = "f97f85089df5e936999d5b7280e2e93e2958fac8" } # egui master 2024-09-25
# egui_extras = { git = "https://github.com/emilk/egui.git", rev = "f97f85089df5e936999d5b7280e2e93e2958fac8" } # egui master 2024-09-25
# egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "f97f85089df5e936999d5b7280e2e93e2958fac8" } # egui master 2024-09-25
# emath = { git = "https://github.com/emilk/egui.git", rev = "f97f85089df5e936999d5b7280e2e93e2958fac8" } # egui master 2024-09-25

# Useful while developing:
# ecolor = { path = "../../egui/crates/ecolor" }
Expand All @@ -532,10 +532,10 @@ emath = { git = "https://github.com/emilk/egui.git", rev = "f97f85089df5e936999d
# egui_plot = { git = "https://github.com/emilk/egui_plot.git", rev = "1f6ae49a5f6bf43a869c215dea0d3028be8d742a" }
# egui_plot = { path = "../../egui_plot/egui_plot" }

egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", rev = "b2f5e232524deed983bcad01c05f27d0e8b89d98" } # https://github.com/rerun-io/egui_tiles/pull/78 2024-08-28
# egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", rev = "b2f5e232524deed983bcad01c05f27d0e8b89d98" } # https://github.com/rerun-io/egui_tiles/pull/78 2024-08-28
# egui_tiles = { path = "../egui_tiles" }

egui_commonmark = { git = "https://github.com/rerun-io/egui_commonmark", rev = "7a9dc755bfa351a3796274cb8ca87129b051c084" } # https://github.com/lampsitter/egui_commonmark/pull/65
# egui_commonmark = { git = "https://github.com/rerun-io/egui_commonmark", rev = "7a9dc755bfa351a3796274cb8ca87129b051c084" } # https://github.com/lampsitter/egui_commonmark/pull/65

# commit on `rerun-io/mp4` `master` branch: https://github.com/rerun-io/re_mp4/tree/master
# https://github.com/rerun-io/mp4/commit/3236c76f9228cf6ab0b2bfb1b8f9ffcde975ea05
Expand Down
2 changes: 1 addition & 1 deletion crates/viewer/re_space_view_dataframe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ re_viewport_blueprint.workspace = true

anyhow.workspace = true
egui_extras.workspace = true
egui_table = { git = "https://github.com/rerun-io/egui_table.git", rev = "15be049a4eac3b9f87aa758505ebe46fd76dcef6" } # main as of 2024-09-25
egui_table = { git = "https://github.com/rerun-io/egui_table.git", rev = "556d4f080a0259e5f46901733e4c3a02f7f0b06a" } # main as of 2024-09-27
egui.workspace = true
itertools.workspace = true
thiserror.workspace = true

0 comments on commit 846478f

Please sign in to comment.