Merge remote-tracking branch 'origin/main' into andreas/generic-view-…

…property-reset-buttons
rerun-io · May 27, 2024 · 3ef94ca · 3ef94ca
2 parents 0cd16d0 + 30ec825
commit 3ef94ca
Show file tree

Hide file tree

Showing 85 changed files with 1,708 additions and 1,351 deletions.
diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
@@ -88,13 +88,14 @@ Of course, this will only take us so far. In the future we plan on caching queri
 Here is an overview of the crates included in the project:
 
 <picture>
-  <img src="https://static.rerun.io/crates/b431e1271e48eaba8db3a38fef18f27227db9b2d/full.png" alt="">
-  <source media="(max-width: 480px)" srcset="https://static.rerun.io/crates/b431e1271e48eaba8db3a38fef18f27227db9b2d/480w.png">
-  <source media="(max-width: 768px)" srcset="https://static.rerun.io/crates/b431e1271e48eaba8db3a38fef18f27227db9b2d/768w.png">
-  <source media="(max-width: 1024px)" srcset="https://static.rerun.io/crates/b431e1271e48eaba8db3a38fef18f27227db9b2d/1024w.png">
-  <source media="(max-width: 1200px)" srcset="https://static.rerun.io/crates/b431e1271e48eaba8db3a38fef18f27227db9b2d/1200w.png">
+  <img src="https://static.rerun.io/crates/6fa2652f031b744bb2f6ba3f09e2383378e9a372/full.png" alt="">
+  <source media="(max-width: 480px)" srcset="https://static.rerun.io/crates/6fa2652f031b744bb2f6ba3f09e2383378e9a372/480w.png">
+  <source media="(max-width: 768px)" srcset="https://static.rerun.io/crates/6fa2652f031b744bb2f6ba3f09e2383378e9a372/768w.png">
+  <source media="(max-width: 1024px)" srcset="https://static.rerun.io/crates/6fa2652f031b744bb2f6ba3f09e2383378e9a372/1024w.png">
+  <source media="(max-width: 1200px)" srcset="https://static.rerun.io/crates/6fa2652f031b744bb2f6ba3f09e2383378e9a372/1200w.png">
 </picture>
 
+
 <!-- !!! IMPORTANT!!!
 
 This image must be updated each time a crate is added/removed/updated.
@@ -126,14 +127,11 @@ Update instructions:
 
 | Crate                       | Description                                                                            |
 |-----------------------------|----------------------------------------------------------------------------------------|
+| re_blueprint_tree           | The UI for the blueprint tree in the left panel.                                       |
 | re_viewer                   | The Rerun Viewer                                                                       |
 | re_viewport                 | The central viewport panel of the Rerun viewer.                                        |
-| re_viewport_blueprint       | The data model description of the viewport panel.                                      |
 | re_time_panel               | The time panel of the Rerun Viewer, allowing to control the displayed timeline & time. |
-| re_data_ui                  | Provides ui elements for Rerun component data for the Rerun Viewer.                    |
-| re_viewer_context           | Rerun Viewer state that is shared with the viewer's code components.                   |
-| re_ui                       | Rerun GUI theme and helpers, built around egui                                         |
-| re_renderer                 | A wgpu-based renderer for all your visualization needs.                                |
+| re_selection_panel          | The UI for the selection panel.                                                        |
 | re_space_view               | Types & utilities for defining Space View classes and communicating with the Viewport. |
 | re_space_view_bar_chart     | A Space View that shows a single bar chart.                                            |
 | re_space_view_dataframe     | A Space View that shows the data contained in entities in a table.                     |
@@ -144,6 +142,18 @@ Update instructions:
 | re_space_view_time_series   | A Space View that shows plots over Rerun timelines.                                    |
 
 
+##### UI support crates
+
+| Crate                 | Description                                                          |
+|-----------------------|----------------------------------------------------------------------|
+| re_context_menu       | Support crate for context menu and actions.                          |
+| re_data_ui            | Provides ui elements for Rerun component data for the Rerun Viewer.  |
+| re_renderer           | A wgpu-based renderer for all your visualization needs.              |
+| re_ui                 | Rerun GUI theme and helpers, built around egui                       |
+| re_viewer_context     | Rerun Viewer state that is shared with the viewer's code components. |
+| re_viewport_blueprint | The data model description of the viewport panel.                    |
+
+
 ### Application-level store
 
 | Crate                | Description                                                              |

diff --git a/Cargo.lock b/Cargo.lock
@@ -4150,6 +4150,25 @@ dependencies = [
  "simdutf8",
 ]
 
+[[package]]
+name = "re_blueprint_tree"
+version = "0.17.0-alpha.2"
+dependencies = [
+ "egui",
+ "itertools 0.12.0",
+ "re_context_menu",
+ "re_data_ui",
+ "re_entity_db",
+ "re_log",
+ "re_log_types",
+ "re_tracing",
+ "re_types",
+ "re_ui",
+ "re_viewer_context",
+ "re_viewport_blueprint",
+ "smallvec",
+]
+
 [[package]]
 name = "re_build_info"
 version = "0.17.0-alpha.2"
@@ -4170,6 +4189,27 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "re_context_menu"
+version = "0.17.0-alpha.2"
+dependencies = [
+ "egui",
+ "egui_tiles",
+ "itertools 0.12.0",
+ "nohash-hasher",
+ "once_cell",
+ "re_entity_db",
+ "re_log",
+ "re_log_types",
+ "re_smart_channel",
+ "re_tracing",
+ "re_types",
+ "re_ui",
+ "re_viewer_context",
+ "re_viewport_blueprint",
+ "static_assertions",
+]
+
 [[package]]
 name = "re_crash_handler"
 version = "0.17.0-alpha.2"
@@ -4628,6 +4668,34 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "re_selection_panel"
+version = "0.17.0-alpha.2"
+dependencies = [
+ "egui",
+ "egui_tiles",
+ "itertools 0.12.0",
+ "nohash-hasher",
+ "once_cell",
+ "re_context_menu",
+ "re_data_store",
+ "re_data_ui",
+ "re_entity_db",
+ "re_log",
+ "re_log_types",
+ "re_renderer",
+ "re_space_view_spatial",
+ "re_space_view_time_series",
+ "re_tracing",
+ "re_types",
+ "re_types_core",
+ "re_ui",
+ "re_viewer_context",
+ "re_viewport_blueprint",
+ "serde",
+ "static_assertions",
+]
+
 [[package]]
 name = "re_smart_channel"
 version = "0.17.0-alpha.2"
@@ -4647,7 +4715,6 @@ dependencies = [
  "egui",
  "re_data_store",
  "re_entity_db",
- "re_log_types",
  "re_tracing",
  "re_types_core",
  "re_ui",
@@ -4827,6 +4894,7 @@ version = "0.17.0-alpha.2"
 dependencies = [
  "egui",
  "itertools 0.12.0",
+ "re_context_menu",
  "re_data_store",
  "re_data_ui",
  "re_entity_db",
@@ -4836,7 +4904,6 @@ dependencies = [
  "re_types",
  "re_ui",
  "re_viewer_context",
- "re_viewport",
  "re_viewport_blueprint",
  "serde",
  "vec1",
@@ -4997,14 +5064,13 @@ dependencies = [
  "egui",
  "egui-wgpu",
  "egui_plot",
- "egui_tiles",
  "ehttp",
  "image",
  "itertools 0.12.0",
  "js-sys",
- "once_cell",
  "poll-promise",
  "re_analytics",
+ "re_blueprint_tree",
  "re_build_info",
  "re_build_tools",
  "re_data_loader",
@@ -5021,8 +5087,8 @@ dependencies = [
  "re_query",
  "re_renderer",
  "re_sdk_comms",
+ "re_selection_panel",
  "re_smart_channel",
- "re_space_view",
  "re_space_view_bar_chart",
  "re_space_view_dataframe",
  "re_space_view_spatial",
@@ -5044,7 +5110,6 @@ dependencies = [
  "ron",
  "serde",
  "serde_json",
- "static_assertions",
  "thiserror",
  "time",
  "wasm-bindgen",
@@ -5106,23 +5171,19 @@ dependencies = [
  "image",
  "itertools 0.12.0",
  "nohash-hasher",
- "once_cell",
  "rayon",
- "re_data_ui",
+ "re_context_menu",
  "re_entity_db",
  "re_log",
  "re_log_types",
  "re_renderer",
- "re_smart_channel",
  "re_space_view",
  "re_tracing",
  "re_types",
  "re_types_blueprint",
  "re_ui",
  "re_viewer_context",
  "re_viewport_blueprint",
- "smallvec",
- "static_assertions",
 ]
 
 [[package]]
@@ -5134,6 +5195,8 @@ dependencies = [
  "egui_tiles",
  "itertools 0.12.0",
  "nohash-hasher",
+ "once_cell",
+ "parking_lot",
  "re_data_store",
  "re_entity_db",
  "re_log",
@@ -5142,6 +5205,7 @@ dependencies = [
  "re_types",
  "re_types_blueprint",
  "re_types_core",
+ "re_ui",
  "re_viewer_context",
  "slotmap",
  "smallvec",

diff --git a/Cargo.toml b/Cargo.toml
@@ -29,9 +29,11 @@ version = "0.17.0-alpha.2"
 # In particular: if we compile rerun 0.3.0-alpha.0 we only want it to use
 # re_log_types 0.3.0-alpha.0, NOT 0.3.0-alpha.4 even though it is newer and semver-compatible.
 re_analytics = { path = "crates/re_analytics", version = "=0.17.0-alpha.2", default-features = false }
+re_blueprint_tree = { path = "crates/re_blueprint_tree", version = "=0.17.0-alpha.2", default-features = false }
 re_build_info = { path = "crates/re_build_info", version = "=0.17.0-alpha.2", default-features = false }
 re_build_tools = { path = "crates/re_build_tools", version = "=0.17.0-alpha.2", default-features = false }
 re_crash_handler = { path = "crates/re_crash_handler", version = "=0.17.0-alpha.2", default-features = false }
+re_context_menu = { path = "crates/re_context_menu", version = "=0.17.0-alpha.2", default-features = false }
 re_data_loader = { path = "crates/re_data_loader", version = "=0.17.0-alpha.2", default-features = false }
 re_data_source = { path = "crates/re_data_source", version = "=0.17.0-alpha.2", default-features = false }
 re_data_store = { path = "crates/re_data_store", version = "=0.17.0-alpha.2", default-features = false }
@@ -48,6 +50,7 @@ re_log_types = { path = "crates/re_log_types", version = "=0.17.0-alpha.2", defa
 re_memory = { path = "crates/re_memory", version = "=0.17.0-alpha.2", default-features = false }
 re_query = { path = "crates/re_query", version = "=0.17.0-alpha.2", default-features = false }
 re_renderer = { path = "crates/re_renderer", version = "=0.17.0-alpha.2", default-features = false }
+re_selection_panel = { path = "crates/re_selection_panel", version = "=0.17.0-alpha.2", default-features = false }
 re_sdk = { path = "crates/re_sdk", version = "=0.17.0-alpha.2", default-features = false }
 re_sdk_comms = { path = "crates/re_sdk_comms", version = "=0.17.0-alpha.2", default-features = false }
 re_smart_channel = { path = "crates/re_smart_channel", version = "=0.17.0-alpha.2", default-features = false }

diff --git a/crates/re_blueprint_tree/Cargo.toml b/crates/re_blueprint_tree/Cargo.toml
@@ -0,0 +1,35 @@
+[package]
+authors.workspace = true
+description = "The UI for the blueprint tree in the left panel."
+edition.workspace = true
+homepage.workspace = true
+license.workspace = true
+name = "re_blueprint_tree"
+publish = true
+readme = "README.md"
+repository.workspace = true
+rust-version.workspace = true
+version.workspace = true
+include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
+
+[lints]
+workspace = true
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+re_context_menu.workspace = true
+re_data_ui.workspace = true
+re_entity_db = { workspace = true, features = ["serde"] }
+re_log_types.workspace = true
+re_log.workspace = true
+re_tracing.workspace = true
+re_types.workspace = true
+re_ui.workspace = true
+re_viewer_context.workspace = true
+re_viewport_blueprint.workspace = true
+
+egui.workspace = true
+itertools.workspace = true
+smallvec.workspace = true
diff --git a/crates/re_blueprint_tree/README.md b/crates/re_blueprint_tree/README.md
@@ -0,0 +1,10 @@
+# re_blueprint_tree
+
+Part of the [`rerun`](https://github.com/rerun-io/rerun) family of crates.
+
+[![Latest version](https://img.shields.io/crates/v/re_blueprint_tree.svg)](https://crates.io/crates/re_blueprint_tree?speculative-link)
+[![Documentation](https://docs.rs/re_blueprint_tree/badge.svg)](https://docs.rs/re_blueprint_tree?speculative-link)
+![MIT](https://img.shields.io/badge/license-MIT-blue.svg)
+![Apache](https://img.shields.io/badge/license-Apache-blue.svg)
+
+The UI for the blueprint tree in the left panel.