fix meaning of 'exact_included' and make it a requirement for project…

…ions
rerun-io · Feb 28, 2024 · 57f527e · 57f527e
1 parent e3b75f3
commit 57f527e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/crates/re_space_view/src/data_query_blueprint.rs b/crates/re_space_view/src/data_query_blueprint.rs
@@ -337,13 +337,13 @@ impl<'a> QueryExpressionEvaluator<'a> {
         // Ignore empty nodes.
         // Since we recurse downwards, this prunes any branches that don't have anything to contribute to the scene
         // and aren't directly included.
-        let direct_included = self.entity_path_filter.is_exact_included(entity_path);
-        if direct_included || !children.is_empty() || !visualizers.is_empty() {
+        let exact_included = self.entity_path_filter.is_exact_included(entity_path);
+        if exact_included || !children.is_empty() || !visualizers.is_empty() {
             Some(data_results.insert(DataResultNode {
                 data_result: DataResult {
                     entity_path: entity_path.clone(),
                     visualizers,
-                    direct_included,
+                    direct_included: self.entity_path_filter.is_included(entity_path),
                     property_overrides: None,
                 },
                 children,

diff --git a/crates/re_viewport/src/space_view_entity_picker.rs b/crates/re_viewport/src/space_view_entity_picker.rs
@@ -161,7 +161,7 @@ fn add_entities_line_ui(
 
         let add_info = entities_add_info.get(entity_path).unwrap();
 
-        let is_explicitly_excluded = entity_path_filter.is_explicitly_excluded(entity_path);
+        let is_explicitly_excluded = entity_path_filter.is_included(entity_path);
         let is_explicitly_included = entity_path_filter.is_explicitly_included(entity_path);
         let is_included = entity_path_filter.is_included(entity_path);
 

diff --git a/crates/re_viewport/src/viewport_blueprint_ui.rs b/crates/re_viewport/src/viewport_blueprint_ui.rs
@@ -278,13 +278,15 @@ impl Viewport<'_, '_> {
                     space_view_visible,
                 );
 
-                // Show 'projections' if there's any items that weren't part of the tree under origin.
+                // Show 'projections' if there's any items that weren't part of the tree under origin but are directly included.
+                // The later is important since `+ image/camera/**` necessarily has `image` and `image/camera` in the data result tree.
                 let mut projections = Vec::new();
                 result_tree.visit(&mut |node| {
                     if !node
                         .data_result
                         .entity_path
                         .starts_with(&space_view.space_origin)
+                        && node.data_result.direct_included
                     {
                         projections.push(node);
                         false