Separate 2d & 3d spaceview classes, removal of ViewCategory, SpaceViewClass driven spawn heuristics

crates/re_data_ui/src/item_ui.rs

@@ -10,7 +10,7 @@ use re_viewer_context::{
 
 use super::DataUi;
 
-// TODO(andreas): This is where we want to go, but we need to figure out how get the `SpaceViewCategory` from the `SpaceViewId`.
+// TODO(andreas): This is where we want to go, but we need to figure out how get the [`re_viewer_context::SpaceViewClass`] from the `SpaceViewId`.
 // Simply pass in optional icons?
 //
 // Show a button to an [`Item`] with a given text.

crates/re_space_view_bar_chart/src/space_view_class.rs

@@ -24,7 +24,7 @@ impl SpaceViewClass for BarChartSpaceView {
         &re_ui::icons::SPACE_VIEW_HISTOGRAM
     }
 
-    fn help_text(&self, re_ui: &re_ui::ReUi, _state: &Self::State) -> egui::WidgetText {
+    fn help_text(&self, re_ui: &re_ui::ReUi) -> egui::WidgetText {
         let mut layout = re_ui::LayoutJobBuilder::new(re_ui);
 
         layout.add("Pan by dragging, or scroll (+ ");

crates/re_space_view_bar_chart/src/view_part_system.rs

@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 use re_arrow_store::LatestAtQuery;
 use re_components::Tensor;
 use re_data_store::EntityPath;
-use re_log_types::Component as _;
+use re_log_types::{Component as _, ComponentName, TimeInt, Timeline};
 use re_viewer_context::{
     ArchetypeDefinition, SpaceViewSystemExecutionError, ViewContextCollection, ViewPartSystem,
     ViewQuery, ViewerContext,
@@ -20,6 +20,26 @@ impl ViewPartSystem for BarChartViewPartSystem {
         vec1::vec1![Tensor::name()]
     }
 
+    fn queries_any_components_of(
+        &self,
+        store: &re_arrow_store::DataStore,
+        ent_path: &EntityPath,
+        components: &[ComponentName],
+    ) -> bool {
+        if !components.contains(&Tensor::name()) {
+            return false;
+        }
+
+        if let Some(tensor) = store.query_latest_component::<Tensor>(
+            ent_path,
+            &LatestAtQuery::new(Timeline::log_time(), TimeInt::MAX),
+        ) {
+            tensor.is_vector()
+        } else {
+            false
+        }
+    }
+
     fn execute(
         &mut self,
         ctx: &mut ViewerContext<'_>,

crates/re_space_view_spatial/src/contexts/mod.rs

@@ -23,16 +23,13 @@ pub struct SpatialSceneEntityContext<'a> {
     pub depth_offset: DepthOffset,
     pub annotations: std::sync::Arc<Annotations>,
     pub shared_render_builders: &'a SharedRenderBuilders,
-    pub counter: &'a PrimitiveCounter,
 
     pub highlight: &'a re_viewer_context::SpaceViewOutlineMasks, // Not part of the context, but convenient to have here.
 }
 
-// TODO(andreas): num_3d_primitives is likely not needed in this form once 2D/3D separation is gone. num_primitives should be handled in a more general way?
 #[derive(Default)]
 pub struct PrimitiveCounter {
     pub num_primitives: AtomicUsize,
-    pub num_3d_primitives: AtomicUsize,
 }
 
 impl ViewContextSystem for PrimitiveCounter {

crates/re_space_view_spatial/src/heuristics.rs

@@ -0,0 +1,47 @@
+use nohash_hasher::IntSet;
+use re_log_types::{EntityPath, Timeline};
+use re_viewer_context::{AutoSpawnHeuristic, SpaceViewClassName, ViewerContext};
+
+use crate::{parts::SpatialViewPartData, view_kind::SpatialSpaceViewKind};
+
+pub fn auto_spawn_heuristic(
+    class: &SpaceViewClassName,
+    ctx: &ViewerContext<'_>,
+    ent_paths: &IntSet<EntityPath>,
+    view_kind: SpatialSpaceViewKind,
+) -> AutoSpawnHeuristic {
+    re_tracing::profile_function!();
+
+    let store = ctx.store_db.store();
+    let timeline = Timeline::log_time();
+
+    let mut score = 0.0;
+
+    let parts = ctx
+        .space_view_class_registry
+        .get_system_registry_or_log_error(class)
+        .new_part_collection();
+    let parts_with_view_kind = parts
+        .iter()
+        .filter(|part| {
+            part.data()
+                .and_then(|d| d.downcast_ref::<SpatialViewPartData>())
+                .map_or(false, |data| data.preferred_view_kind == Some(view_kind))
+        })
+        .collect::<Vec<_>>();
+
+    for ent_path in ent_paths {
+        let Some(components) = store.all_components(&timeline, ent_path) else {
+                continue;
+            };
+
+        for part in &parts_with_view_kind {
+            if part.queries_any_components_of(store, ent_path, &components) {
+                score += 1.0;
+                break;
+            }
+        }
+    }
+
+    AutoSpawnHeuristic::SpawnClassWithHighestScoreForRoot(score)
+}

crates/re_space_view_spatial/src/lib.rs

@@ -4,15 +4,28 @@
 
 mod contexts;
 mod eye;
+mod heuristics;
 mod instance_hash_conversions;
 mod mesh_cache;
 mod mesh_loader;
 mod parts;
 mod picking;
 mod space_camera_3d;
-mod space_view_class;
+mod space_view_2d;
+mod space_view_3d;
 mod ui;
 mod ui_2d;
 mod ui_3d;
 
-pub use space_view_class::SpatialSpaceView;
+pub use space_view_2d::SpatialSpaceView2D;
+pub use space_view_3d::SpatialSpaceView3D;
+
+// ---
+
+mod view_kind {
+    #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    pub enum SpatialSpaceViewKind {
+        TwoD,
+        ThreeD,
+    }
+}

crates/re_space_view_spatial/src/parts/arrows3d.rs

@@ -11,11 +11,17 @@ use super::{picking_id_from_instance_key, SpatialViewPartData};
 use crate::{
     contexts::{EntityDepthOffsets, SpatialSceneEntityContext},
     parts::entity_iterator::process_entity_views,
+    view_kind::SpatialSpaceViewKind,
 };
 
-#[derive(Default)]
 pub struct Arrows3DPart(SpatialViewPartData);
 
+impl Default for Arrows3DPart {
+    fn default() -> Self {
+        Self(SpatialViewPartData::new(Some(SpatialSpaceViewKind::ThreeD)))
+    }
+}
+
 impl Arrows3DPart {
     fn process_entity_view(
         &mut self,
@@ -113,10 +119,6 @@ impl ViewPartSystem for Arrows3DPart {
             view_ctx.get::<EntityDepthOffsets>()?.points,
             self.archetype(),
             |_ctx, ent_path, entity_view, ent_context| {
-                ent_context
-                    .counter
-                    .num_3d_primitives
-                    .fetch_add(1, std::sync::atomic::Ordering::Relaxed);
                 self.process_entity_view(query, &entity_view, ent_path, ent_context)
             },
         )?;

crates/re_space_view_spatial/src/parts/boxes2d.rs

@@ -10,13 +10,19 @@ use re_viewer_context::{
 use crate::{
     contexts::{EntityDepthOffsets, SpatialSceneEntityContext},
     parts::{entity_iterator::process_entity_views, UiLabel, UiLabelTarget},
+    view_kind::SpatialSpaceViewKind,
 };
 
 use super::{picking_id_from_instance_key, SpatialViewPartData};
 
-#[derive(Default)]
 pub struct Boxes2DPart(SpatialViewPartData);
 
+impl Default for Boxes2DPart {
+    fn default() -> Self {
+        Self(SpatialViewPartData::new(Some(SpatialSpaceViewKind::TwoD)))
+    }
+}
+
 impl Boxes2DPart {
     fn process_entity_view(
         &mut self,

crates/re_space_view_spatial/src/parts/boxes3d.rs

@@ -12,13 +12,19 @@ use re_viewer_context::{
 use crate::{
     contexts::SpatialSceneEntityContext,
     parts::{entity_iterator::process_entity_views, UiLabel, UiLabelTarget},
+    view_kind::SpatialSpaceViewKind,
 };
 
 use super::{picking_id_from_instance_key, SpatialViewPartData};
 
-#[derive(Default)]
 pub struct Boxes3DPart(SpatialViewPartData);
 
+impl Default for Boxes3DPart {
+    fn default() -> Self {
+        Self(SpatialViewPartData::new(Some(SpatialSpaceViewKind::ThreeD)))
+    }
+}
+
 impl Boxes3DPart {
     fn process_entity_view(
         &mut self,
@@ -124,10 +130,6 @@ impl ViewPartSystem for Boxes3DPart {
             0,
             self.archetype(),
             |_ctx, ent_path, entity_view, ent_context| {
-                ent_context
-                    .counter
-                    .num_3d_primitives
-                    .fetch_add(1, std::sync::atomic::Ordering::Relaxed);
                 self.process_entity_view(query, &entity_view, ent_path, ent_context)
             },
         )?;

crates/re_space_view_spatial/src/parts/cameras.rs

@@ -9,28 +9,35 @@ use re_viewer_context::{
 
 use super::SpatialViewPartData;
 use crate::{
-    contexts::{
-        pinhole_camera_view_coordinates, PrimitiveCounter, SharedRenderBuilders, TransformContext,
-    },
+    contexts::{pinhole_camera_view_coordinates, SharedRenderBuilders, TransformContext},
     instance_hash_conversions::picking_layer_id_from_instance_path_hash,
     space_camera_3d::SpaceCamera3D,
 };
 
 const CAMERA_COLOR: re_renderer::Color32 = re_renderer::Color32::from_rgb(150, 150, 150);
 
-#[derive(Default)]
 pub struct CamerasPart {
     pub data: SpatialViewPartData,
     pub space_cameras: Vec<SpaceCamera3D>,
 }
 
+impl Default for CamerasPart {
+    fn default() -> Self {
+        Self {
+            // Cameras themselves aren't inherently 2D or 3D since they represent intrinsics.
+            // (extrinsics, represented by [`transform3d_arrow::Transform3DArrowsPart`] are 3D though)
+            data: (SpatialViewPartData::new(None)),
+            space_cameras: Vec::new(),
+        }
+    }
+}
+
 impl CamerasPart {
     #[allow(clippy::too_many_arguments)]
     fn visit_instance(
         &mut self,
         transforms: &TransformContext,
         shared_render_builders: &SharedRenderBuilders,
-        primitive_counter: &PrimitiveCounter,
         ent_path: &EntityPath,
         props: &EntityProperties,
         pinhole: Pinhole,
@@ -152,10 +159,6 @@ impl CamerasPart {
         if let Some(outline_mask_ids) = entity_highlight.instances.get(&instance_key) {
             lines.outline_mask_ids(*outline_mask_ids);
         }
-
-        primitive_counter
-            .num_3d_primitives
-            .fetch_add(1, std::sync::atomic::Ordering::Relaxed);
     }
 }
 
@@ -174,7 +177,6 @@ impl ViewPartSystem for CamerasPart {
 
         let transforms = view_ctx.get::<TransformContext>()?;
         let shared_render_builders = view_ctx.get::<SharedRenderBuilders>()?;
-        let primitive_counter = view_ctx.get::<PrimitiveCounter>()?;
 
         let store = ctx.store_db.store();
         for (ent_path, props) in query.iter_entities() {
@@ -191,7 +193,6 @@ impl ViewPartSystem for CamerasPart {
                 self.visit_instance(
                     transforms,
                     shared_render_builders,
-                    primitive_counter,
                     ent_path,
                     &props,
                     pinhole,

crates/re_space_view_spatial/src/parts/entity_iterator.rs

@@ -62,7 +62,6 @@ where
             annotations: annotations.0.find(ent_path),
             shared_render_builders,
             highlight: query.highlights.entity_outline_mask(ent_path.hash()),
-            counter,
         };
 
         match query_primary_with_history::<Primary, N>(

crates/re_space_view_spatial/src/parts/images.rs

@@ -4,12 +4,13 @@ use egui::NumExt;
 
 use itertools::Itertools as _;
 use nohash_hasher::IntSet;
+use re_arrow_store::LatestAtQuery;
 use re_components::{
     ColorRGBA, Component as _, DecodedTensor, DrawOrder, InstanceKey, Pinhole, Tensor,
     TensorDataMeaning,
 };
 use re_data_store::{EntityPath, EntityProperties};
-use re_log_types::EntityPathHash;
+use re_log_types::{ComponentName, EntityPathHash, TimeInt, Timeline};
 use re_query::{EntityView, QueryError};
 use re_renderer::{
     renderer::{DepthCloud, DepthClouds, RectangleOptions, TexturedRect},
@@ -24,6 +25,7 @@ use re_viewer_context::{
 use crate::{
     contexts::{EntityDepthOffsets, SpatialSceneEntityContext, TransformContext},
     parts::{entity_iterator::process_entity_views, SIZE_BOOST_IN_POINTS_FOR_POINT_OUTLINES},
+    view_kind::SpatialSpaceViewKind,
 };
 
 use super::SpatialViewPartData;
@@ -117,13 +119,22 @@ struct ImageGrouping {
     draw_order: DrawOrder,
 }
 
-#[derive(Default)]
 pub struct ImagesPart {
     pub data: SpatialViewPartData,
     pub images: Vec<Image>,
     pub depth_cloud_entities: IntSet<EntityPathHash>,
 }
 
+impl Default for ImagesPart {
+    fn default() -> Self {
+        Self {
+            data: SpatialViewPartData::new(Some(SpatialSpaceViewKind::TwoD)),
+            images: Vec::new(),
+            depth_cloud_entities: IntSet::default(),
+        }
+    }
+}
+
 impl ImagesPart {
     fn handle_image_layering(&mut self) {
         re_tracing::profile_function!();
@@ -378,6 +389,22 @@ impl ViewPartSystem for ImagesPart {
         ]
     }
 
+    fn queries_any_components_of(
+        &self,
+        store: &re_arrow_store::DataStore,
+        ent_path: &EntityPath,
+        _components: &[ComponentName],
+    ) -> bool {
+        if let Some(tensor) = store.query_latest_component::<Tensor>(
+            ent_path,
+            &LatestAtQuery::new(Timeline::log_time(), TimeInt::MAX),
+        ) {
+            tensor.is_shaped_like_an_image() && !tensor.is_vector()
+        } else {
+            false
+        }
+    }
+
     fn execute(
         &mut self,
         ctx: &mut ViewerContext<'_>,