Improve heuristics around 2D vs 3D space-view creation

crates/re_space_view_bar_chart/src/view_part_system.rs

@@ -8,8 +8,8 @@ use re_types::{
     Archetype, ComponentNameSet,
 };
 use re_viewer_context::{
-    default_heuristic_filter, NamedViewSystem, SpaceViewSystemExecutionError,
-    ViewContextCollection, ViewPartSystem, ViewQuery, ViewerContext,
+    default_heuristic_filter, HeuristicFilterContext, NamedViewSystem,
+    SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem, ViewQuery, ViewerContext,
 };
 
 /// A bar chart system, with everything needed to render it.
@@ -45,6 +45,7 @@ impl ViewPartSystem for BarChartViewPartSystem {
         &self,
         store: &re_arrow_store::DataStore,
         ent_path: &EntityPath,
+        _ctx: HeuristicFilterContext,
         query: &LatestAtQuery,
         entity_components: &ComponentNameSet,
     ) -> bool {

crates/re_space_view_spatial/src/heuristics.rs

@@ -57,11 +57,6 @@ pub fn auto_spawn_heuristic(
         }
     }
 
-    if view_kind == SpatialSpaceViewKind::TwoD {
-        // Prefer 2D views over 3D views.
-        score += 0.1;
-    }
-
     AutoSpawnHeuristic::SpawnClassWithHighestScoreForRoot(score)
 }
 

crates/re_space_view_spatial/src/parts/boxes2d.rs

@@ -1,3 +1,4 @@
+use re_arrow_store::LatestAtQuery;
 use re_data_store::{EntityPath, InstancePathHash};
 use re_query::{ArchetypeView, QueryError};
 use re_types::{
@@ -6,8 +7,8 @@ use re_types::{
     Archetype, ComponentNameSet,
 };
 use re_viewer_context::{
-    NamedViewSystem, ResolvedAnnotationInfos, SpaceViewSystemExecutionError, ViewContextCollection,
-    ViewPartSystem, ViewQuery, ViewerContext,
+    default_heuristic_filter, HeuristicFilterContext, NamedViewSystem, ResolvedAnnotationInfos,
+    SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem, ViewQuery, ViewerContext,
 };
 
 use crate::{
@@ -177,6 +178,26 @@ impl ViewPartSystem for Boxes2DPart {
         std::iter::once(Boxes2D::indicator().name()).collect()
     }
 
+    fn heuristic_filter(
+        &self,
+        _store: &re_arrow_store::DataStore,
+        _ent_path: &EntityPath,
+        ctx: HeuristicFilterContext,
+        _query: &LatestAtQuery,
+        entity_components: &ComponentNameSet,
+    ) -> bool {
+        if !default_heuristic_filter(entity_components, &self.indicator_components()) {
+            return false;
+        }
+
+        // If this is a 3D view and there's no parent pinhole, do not include this part.
+        if ctx.class == "3D" && !ctx.has_ancestor_pinhole {
+            return false;
+        }
+
+        true
+    }
+
     fn execute(
         &mut self,
         ctx: &mut ViewerContext<'_>,

crates/re_space_view_spatial/src/parts/images.rs

@@ -19,7 +19,7 @@ use re_types::{
     Archetype as _, ComponentNameSet,
 };
 use re_viewer_context::{
-    default_heuristic_filter, gpu_bridge, DefaultColor, SpaceViewClass,
+    default_heuristic_filter, gpu_bridge, DefaultColor, HeuristicFilterContext, SpaceViewClass,
     SpaceViewSystemExecutionError, TensorDecodeCache, TensorStatsCache, ViewPartSystem, ViewQuery,
     ViewerContext,
 };
@@ -681,13 +681,19 @@ impl ViewPartSystem for ImagesPart {
         &self,
         store: &re_arrow_store::DataStore,
         ent_path: &EntityPath,
+        ctx: HeuristicFilterContext,
         query: &LatestAtQuery,
         entity_components: &ComponentNameSet,
     ) -> bool {
         if !default_heuristic_filter(entity_components, &self.indicator_components()) {
             return false;
         }
 
+        // If this is a 3D view and there's no parent pinhole, do not include this part.
+        if ctx.class == "3D" && !ctx.has_ancestor_pinhole {
+            return false;
+        }
+
         // NOTE: We want to make sure we query at the right time, otherwise we might take into
         // account a `Clear()` that actually only applies into the future, and then
         // `is_shaped_like_an_image` will righfully fail because of the empty tensor.

crates/re_space_view_spatial/src/parts/lines2d.rs

@@ -1,3 +1,4 @@
+use re_arrow_store::LatestAtQuery;
 use re_data_store::{EntityPath, InstancePathHash};
 use re_query::{ArchetypeView, QueryError};
 use re_types::{
@@ -6,8 +7,8 @@ use re_types::{
     Archetype as _, ComponentNameSet,
 };
 use re_viewer_context::{
-    NamedViewSystem, ResolvedAnnotationInfos, SpaceViewSystemExecutionError, ViewContextCollection,
-    ViewPartSystem, ViewQuery, ViewerContext,
+    default_heuristic_filter, HeuristicFilterContext, NamedViewSystem, ResolvedAnnotationInfos,
+    SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem, ViewQuery, ViewerContext,
 };
 
 use crate::{
@@ -172,6 +173,26 @@ impl ViewPartSystem for Lines2DPart {
         std::iter::once(LineStrips2D::indicator().name()).collect()
     }
 
+    fn heuristic_filter(
+        &self,
+        _store: &re_arrow_store::DataStore,
+        _ent_path: &EntityPath,
+        ctx: HeuristicFilterContext,
+        _query: &LatestAtQuery,
+        entity_components: &ComponentNameSet,
+    ) -> bool {
+        if !default_heuristic_filter(entity_components, &self.indicator_components()) {
+            return false;
+        }
+
+        // If this is a 3D view and there's no parent pinhole, do not include this part.
+        if ctx.class == "3D" && !ctx.has_ancestor_pinhole {
+            return false;
+        }
+
+        true
+    }
+
     fn execute(
         &mut self,
         ctx: &mut ViewerContext<'_>,

crates/re_space_view_spatial/src/parts/points2d.rs

@@ -1,3 +1,4 @@
+use re_arrow_store::LatestAtQuery;
 use re_data_store::{EntityPath, InstancePathHash};
 use re_query::{ArchetypeView, QueryError};
 use re_types::{
@@ -6,8 +7,8 @@ use re_types::{
     Archetype, ComponentNameSet,
 };
 use re_viewer_context::{
-    NamedViewSystem, ResolvedAnnotationInfos, SpaceViewSystemExecutionError, ViewContextCollection,
-    ViewPartSystem, ViewQuery, ViewerContext,
+    default_heuristic_filter, HeuristicFilterContext, NamedViewSystem, ResolvedAnnotationInfos,
+    SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem, ViewQuery, ViewerContext,
 };
 
 use crate::{
@@ -199,6 +200,26 @@ impl ViewPartSystem for Points2DPart {
         std::iter::once(Points2D::indicator().name()).collect()
     }
 
+    fn heuristic_filter(
+        &self,
+        _store: &re_arrow_store::DataStore,
+        _ent_path: &EntityPath,
+        ctx: HeuristicFilterContext,
+        _query: &LatestAtQuery,
+        entity_components: &ComponentNameSet,
+    ) -> bool {
+        if !default_heuristic_filter(entity_components, &self.indicator_components()) {
+            return false;
+        }
+
+        // If this is a 3D view and there's no parent pinhole, do not include this part.
+        if ctx.class == "3D" && !ctx.has_ancestor_pinhole {
+            return false;
+        }
+
+        true
+    }
+
     fn execute(
         &mut self,
         ctx: &mut ViewerContext<'_>,

crates/re_space_view_spatial/src/space_view_2d.rs

@@ -8,7 +8,7 @@ use re_viewer_context::{
 use crate::{
     contexts::{register_spatial_contexts, PrimitiveCounter},
     heuristics::{auto_spawn_heuristic, update_object_property_heuristics},
-    parts::{calculate_bounding_box, register_2d_spatial_parts},
+    parts::{calculate_bounding_box, register_2d_spatial_parts, SpatialViewPartData},
     ui::SpatialSpaceViewState,
     view_kind::SpatialSpaceViewKind,
 };
@@ -69,10 +69,51 @@ impl SpaceViewClass for SpatialSpaceView2D {
     fn auto_spawn_heuristic(
         &self,
         ctx: &ViewerContext<'_>,
-        _space_origin: &EntityPath,
-        ent_paths: &PerSystemEntities,
+        space_origin: &EntityPath,
+        per_system_entities: &PerSystemEntities,
     ) -> AutoSpawnHeuristic {
-        auto_spawn_heuristic(&self.name(), ctx, ent_paths, SpatialSpaceViewKind::TwoD)
+        let mut score = auto_spawn_heuristic(
+            &self.name(),
+            ctx,
+            per_system_entities,
+            SpatialSpaceViewKind::TwoD,
+        );
+
+        // If this is the root space view, and it contains a part that would
+        // prefer to be 3D, don't spawn the 2D view. This is because it's never
+        // possible to correctly project 3d objects to a root 2d view since the
+        // the pinhole would go past the root.
+        if space_origin.is_root() {
+            let parts = ctx
+                .space_view_class_registry
+                .get_system_registry_or_log_error(&self.name())
+                .new_part_collection();
+
+            for part in per_system_entities.keys() {
+                if let Ok(part) = parts.get_by_name(*part) {
+                    if let Some(part_data) = part
+                        .data()
+                        .and_then(|d| d.downcast_ref::<SpatialViewPartData>())
+                    {
+                        if part_data.preferred_view_kind == Some(SpatialSpaceViewKind::ThreeD) {
+                            return AutoSpawnHeuristic::NeverSpawn;
+                        }
+                    }
+                }
+            }
+        }
+
+        if let AutoSpawnHeuristic::SpawnClassWithHighestScoreForRoot(score) = &mut score {
+            // If a 2D view contains nothing inherently 2D in nature, don't
+            // spawn it, though in all other cases default to 2D over 3D as a tie-breaker.
+            if *score == 0.0 {
+                return AutoSpawnHeuristic::NeverSpawn;
+            } else {
+                *score += 0.1;
+            }
+        }
+
+        score
     }
 
     fn selection_ui(

crates/re_space_view_tensor/src/view_part_system.rs

@@ -6,8 +6,9 @@ use re_types::{
     ComponentNameSet,
 };
 use re_viewer_context::{
-    default_heuristic_filter, NamedViewSystem, SpaceViewSystemExecutionError, TensorDecodeCache,
-    ViewContextCollection, ViewPartSystem, ViewQuery, ViewerContext,
+    default_heuristic_filter, HeuristicFilterContext, NamedViewSystem,
+    SpaceViewSystemExecutionError, TensorDecodeCache, ViewContextCollection, ViewPartSystem,
+    ViewQuery, ViewerContext,
 };
 
 #[derive(Default)]
@@ -37,6 +38,7 @@ impl ViewPartSystem for TensorSystem {
         &self,
         store: &re_arrow_store::DataStore,
         ent_path: &EntityPath,
+        _ctx: HeuristicFilterContext,
         query: &LatestAtQuery,
         entity_components: &ComponentNameSet,
     ) -> bool {

crates/re_viewer_context/src/lib.rs

@@ -39,12 +39,12 @@ pub use selection_state::{
     HoverHighlight, HoveredSpace, InteractionHighlight, SelectionHighlight, SelectionState,
 };
 pub use space_view::{
-    default_heuristic_filter, AutoSpawnHeuristic, DynSpaceViewClass, NamedViewSystem,
-    PerSystemEntities, SpaceViewClass, SpaceViewClassLayoutPriority, SpaceViewClassName,
-    SpaceViewClassRegistry, SpaceViewClassRegistryError, SpaceViewEntityHighlight,
-    SpaceViewHighlights, SpaceViewOutlineMasks, SpaceViewState, SpaceViewSystemExecutionError,
-    SpaceViewSystemRegistry, ViewContextCollection, ViewContextSystem, ViewPartCollection,
-    ViewPartSystem, ViewQuery, ViewSystemName,
+    default_heuristic_filter, AutoSpawnHeuristic, DynSpaceViewClass, HeuristicFilterContext,
+    NamedViewSystem, PerSystemEntities, SpaceViewClass, SpaceViewClassLayoutPriority,
+    SpaceViewClassName, SpaceViewClassRegistry, SpaceViewClassRegistryError,
+    SpaceViewEntityHighlight, SpaceViewHighlights, SpaceViewOutlineMasks, SpaceViewState,
+    SpaceViewSystemExecutionError, SpaceViewSystemRegistry, ViewContextCollection,
+    ViewContextSystem, ViewPartCollection, ViewPartSystem, ViewQuery, ViewSystemName,
 };
 pub use store_context::StoreContext;
 pub use tensor::{TensorDecodeCache, TensorStats, TensorStatsCache};

crates/re_viewer_context/src/space_view/mod.rs

@@ -26,7 +26,9 @@ pub use space_view_class_registry::{
     SpaceViewClassRegistry, SpaceViewClassRegistryError, SpaceViewSystemRegistry,
 };
 pub use view_context_system::{ViewContextCollection, ViewContextSystem};
-pub use view_part_system::{default_heuristic_filter, ViewPartCollection, ViewPartSystem};
+pub use view_part_system::{
+    default_heuristic_filter, HeuristicFilterContext, ViewPartCollection, ViewPartSystem,
+};
 pub use view_query::ViewQuery;
 
 // ---------------------------------------------------------------------------

crates/re_viewer_context/src/space_view/view_part_system.rs

@@ -5,10 +5,38 @@ use re_log_types::EntityPath;
 use re_types::ComponentNameSet;
 
 use crate::{
-    NamedViewSystem, SpaceViewSystemExecutionError, ViewContextCollection, ViewQuery,
-    ViewSystemName, ViewerContext,
+    NamedViewSystem, SpaceViewClassName, SpaceViewSystemExecutionError, ViewContextCollection,
+    ViewQuery, ViewSystemName, ViewerContext,
 };
 
+/// This is additional context made available to the `heuristic_filter`.
+/// It includes tree-context information such as whether certain components
+/// exist in the parent hierarchy which are better computed once than having
+/// each entity do their own tree-walk.
+#[derive(Clone, Copy, Debug)]
+pub struct HeuristicFilterContext {
+    pub class: SpaceViewClassName,
+    pub has_ancestor_pinhole: bool,
+}
+
+impl Default for HeuristicFilterContext {
+    fn default() -> HeuristicFilterContext {
+        Self {
+            class: SpaceViewClassName::invalid(),
+            has_ancestor_pinhole: false,
+        }
+    }
+}
+
+impl HeuristicFilterContext {
+    pub fn with_class(&self, class: SpaceViewClassName) -> Self {
+        Self {
+            class,
+            has_ancestor_pinhole: self.has_ancestor_pinhole,
+        }
+    }
+}
+
 /// Element of a scene derived from a single archetype query.
 ///
 /// Is populated after scene contexts and has access to them.
@@ -46,6 +74,7 @@ pub trait ViewPartSystem {
         &self,
         _store: &re_arrow_store::DataStore,
         _ent_path: &EntityPath,
+        _ctx: HeuristicFilterContext,
         _query: &LatestAtQuery,
         entity_components: &ComponentNameSet,
     ) -> bool {
@@ -80,7 +109,7 @@ pub trait ViewPartSystem {
 
 /// The default implementation for [`ViewPartSystem::heuristic_filter`].
 ///
-/// Returns true if eiher `indicator_components` is empty or `entity_components` contains at least one
+/// Returns true if either `indicator_components` is empty or `entity_components` contains at least one
 /// of these indicator components.
 ///
 /// Exported as a standalone function to simplify the implementation of custom filters.

crates/re_viewport/src/space_view.rs

@@ -9,7 +9,8 @@ use re_viewer_context::{
 use crate::{
     space_info::SpaceInfoCollection,
     space_view_heuristics::{
-        is_entity_processed_by_class, reachable_entities_from_root, EntitiesPerSystem,
+        compute_heuristic_context_for_entities, is_entity_processed_by_class,
+        reachable_entities_from_root, EntitiesPerSystem,
     },
 };
 
@@ -255,12 +256,18 @@ impl SpaceViewBlueprint {
     ) {
         re_tracing::profile_function!();
 
+        let heuristic_context = compute_heuristic_context_for_entities(ctx);
+
         let mut entities = Vec::new();
         tree.visit_children_recursively(&mut |entity_path: &EntityPath| {
             if is_entity_processed_by_class(
                 ctx,
                 &self.class_name,
                 entity_path,
+                heuristic_context
+                    .get(entity_path)
+                    .copied()
+                    .unwrap_or_default(),
                 &ctx.current_query(),
             ) && !self.contents.contains_entity(entity_path)
                 && spaces_info