Initial Space View trait & port of text space views to the new Space View trait system

Cargo.toml

@@ -44,6 +44,8 @@ re_renderer = { path = "crates/re_renderer", version = "0.7.0-alpha.0", default-
 re_sdk = { path = "crates/re_sdk", version = "0.7.0-alpha.0", default-features = false }
 re_sdk_comms = { path = "crates/re_sdk_comms", version = "0.7.0-alpha.0", default-features = false }
 re_smart_channel = { path = "crates/re_smart_channel", version = "0.7.0-alpha.0", default-features = false }
+re_space_view_text = { path = "crates/re_space_view_text", version = "0.7.0-alpha.0", default-features = false }
+re_space_view_text_box = { path = "crates/re_space_view_text_box", version = "0.7.0-alpha.0", default-features = false }
 re_string_interner = { path = "crates/re_string_interner", version = "0.7.0-alpha.0", default-features = false }
 re_tensor_ops = { path = "crates/re_tensor_ops", version = "0.7.0-alpha.0", default-features = false }
 re_time_panel = { path = "crates/re_time_panel", version = "=0.7.0-alpha.0", default-features = false }

crates/re_space_view_text/Cargo.toml

@@ -0,0 +1,33 @@
+[package]
+authors.workspace = true
+description = "Provides Rerun Space Views that display text only."
+edition.workspace = true
+homepage.workspace = true
+license.workspace = true
+name = "re_space_view_text"
+publish = true
+readme = "README.md"
+repository.workspace = true
+rust-version.workspace = true
+version.workspace = true
+include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+re_arrow_store.workspace = true
+re_components.workspace = true
+re_data_store.workspace = true
+re_data_ui.workspace = true
+re_log_types.workspace = true
+re_log.workspace = true
+re_query.workspace = true
+re_ui.workspace = true
+re_viewer_context.workspace = true
+
+egui.workspace = true
+egui_extras.workspace = true
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+puffin.workspace = true

crates/re_space_view_text/README.md

@@ -0,0 +1,10 @@
+# re_space_view_text
+
+Part of the [`rerun`](https://github.com/rerun-io/rerun) family of crates.
+
+[![Latest version](https://img.shields.io/crates/v/re_space_view_text.svg)](https://crates.io/crates/re_space_view_text)
+[![Documentation](https://docs.rs/re_space_view_text/badge.svg)](https://docs.rs/re_space_view_text)
+![MIT](https://img.shields.io/badge/license-MIT-blue.svg)
+![Apache](https://img.shields.io/badge/license-Apache-blue.svg)
+
+Provides Rerun Space Views that display text only.

crates/re_space_view_text/src/lib.rs

@@ -0,0 +1,30 @@
+//! Rerun Text Space Views
+//!
+//! Provides Rerun Space Views that deal with text only.
+
+mod scene_element;
+mod space_view_class;
+
+pub use space_view_class::TextSpaceView;
+
+// ---------------------------------------------------------------------------
+
+/// Profiling macro for feature "puffin"
+#[doc(hidden)]
+#[macro_export]
+macro_rules! profile_function {
+    ($($arg: tt)*) => {
+        #[cfg(not(target_arch = "wasm32"))]
+        puffin::profile_function!($($arg)*);
+    };
+}
+
+/// Profiling macro for feature "puffin"
+#[doc(hidden)]
+#[macro_export]
+macro_rules! profile_scope {
+    ($($arg: tt)*) => {
+        #[cfg(not(target_arch = "wasm32"))]
+        puffin::profile_scope!($($arg)*);
+    };
+}

crates/re_viewport/src/view_text/scene.rs → crates/re_space_view_text/src/scene_element.rs

@@ -2,11 +2,9 @@ use re_arrow_store::TimeRange;
 use re_data_store::EntityPath;
 use re_log_types::{Component as _, InstanceKey, RowId};
 use re_query::{range_entity_with_primary, QueryError};
-use re_viewer_context::{SceneQuery, ViewerContext};
+use re_viewer_context::{ArchetypeDefinition, SceneElementImpl, SceneQuery, ViewerContext};
 
-use super::ui::ViewTextFilters;
-
-// ---
+use super::space_view_class::TextSpaceViewState;
 
 #[derive(Debug, Clone)]
 pub struct TextEntry {
@@ -31,24 +29,27 @@ pub struct SceneText {
     pub text_entries: Vec<TextEntry>,
 }
 
-impl SceneText {
-    /// Loads all text components into the scene according to the given query.
-    pub(crate) fn load(
+impl SceneElementImpl for SceneText {
+    type State = TextSpaceViewState;
+
+    fn archetype(&self) -> ArchetypeDefinition {
+        vec![re_components::TextEntry::name()]
+    }
+
+    fn populate(
         &mut self,
-        ctx: &ViewerContext<'_>,
+        ctx: &mut ViewerContext<'_>,
         query: &SceneQuery<'_>,
-        filters: &ViewTextFilters,
+        state: &TextSpaceViewState,
     ) {
-        crate::profile_function!();
-
         let store = &ctx.log_db.entity_db.data_store;
 
         for entity_path in query.entity_paths {
             let ent_path = entity_path;
 
             // Early filtering: if we're not showing it the view, there isn't much point
             // in querying it to begin with... at least for now.
-            if !filters.is_entity_path_visible(ent_path) {
+            if !state.filters.is_entity_path_visible(ent_path) {
                 return;
             }
 
@@ -76,7 +77,7 @@ impl SceneText {
                         // Early filtering once more, see above.
                         let is_visible = level
                             .as_ref()
-                            .map_or(true, |lvl| filters.is_log_level_visible(lvl));
+                            .map_or(true, |lvl| state.filters.is_log_level_visible(lvl));
 
                         if is_visible {
                             self.text_entries.push(TextEntry {
@@ -98,4 +99,8 @@ impl SceneText {
             }
         }
     }
+
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
 }