ViewerContext test harness 0.1

crates/re_data_ui/src/image.rs

@@ -122,8 +122,12 @@ pub fn tensor_ui(
         None
     };
 
+    let Some(render_ctx) = ctx.render_ctx else {
+        return;
+    };
+
     let texture_result = gpu_bridge::tensor_to_gpu(
-        ctx.render_ctx,
+        render_ctx,
         &debug_name,
         tensor_data_row_id,
         tensor,
@@ -147,7 +151,7 @@ pub fn tensor_ui(
                             ui.set_min_size(preview_size);
 
                             show_image_preview(
-                                ctx.render_ctx,
+                                render_ctx,
                                 ctx.re_ui,
                                 ui,
                                 texture.clone(),
@@ -158,7 +162,7 @@ pub fn tensor_ui(
                                 // Show larger image on hover.
                                 let preview_size = Vec2::splat(400.0);
                                 show_image_preview(
-                                    ctx.render_ctx,
+                                    render_ctx,
                                     ctx.re_ui,
                                     ui,
                                     texture.clone(),
@@ -216,7 +220,7 @@ pub fn tensor_ui(
                         .min(texture_size(texture))
                         .min(egui::vec2(150.0, 300.0));
                     let response = show_image_preview(
-                        ctx.render_ctx,
+                        render_ctx,
                         ctx.re_ui,
                         ui,
                         texture.clone(),
@@ -227,7 +231,7 @@ pub fn tensor_ui(
                     if let Some(pointer_pos) = ui.ctx().pointer_latest_pos() {
                         let image_rect = response.rect;
                         show_zoomed_image_region_tooltip(
-                            ctx.render_ctx,
+                            render_ctx,
                             ui,
                             response,
                             tensor_data_row_id,

crates/re_selection_panel/src/lib.rs

@@ -8,3 +8,33 @@ mod space_view_entity_picker;
 mod space_view_space_origin_ui;
 
 pub use selection_panel::SelectionPanel;
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use re_data_store::LatestAtQuery;
+    use re_viewer_context::{blueprint_timeline, Item, SpaceViewId};
+    use re_viewport_blueprint::ViewportBlueprint;
+
+    #[test]
+    fn test_selection_panel() {
+        re_log::setup_logging();
+
+        let mut test_ctx = re_viewer_context::test_context::TestContext::default();
+        test_ctx.edit_selection(|selection_state| {
+            selection_state.set_selection(Item::SpaceView(SpaceViewId::random()));
+        });
+
+        test_ctx.run(|ctx, ui| {
+            let (sender, _) = std::sync::mpsc::channel();
+            let blueprint = ViewportBlueprint::try_from_db(
+                ctx.store_context.blueprint,
+                &LatestAtQuery::latest(blueprint_timeline()),
+                sender,
+            );
+
+            let mut selection_panel = SelectionPanel::default();
+            selection_panel.show_panel(ctx, &blueprint, &mut Default::default(), ui, true);
+        });
+    }
+}

crates/re_space_view_spatial/src/lib.rs

@@ -23,6 +23,7 @@ mod ui_2d;
 mod ui_3d;
 mod visualizers;
 
+use re_renderer::RenderContext;
 use re_types::blueprint::components::BackgroundKind;
 use re_types::components::{Resolution, TensorData};
 
@@ -78,7 +79,7 @@ fn query_pinhole(
 }
 
 pub(crate) fn configure_background(
-    ctx: &re_viewer_context::ViewerContext<'_>,
+    render_ctx: &RenderContext,
     kind: BackgroundKind,
     color: re_types::components::Color,
 ) -> (Option<re_renderer::QueueableDrawData>, re_renderer::Rgba) {
@@ -88,7 +89,7 @@ pub(crate) fn configure_background(
         BackgroundKind::GradientDark => (
             Some(
                 renderer::GenericSkyboxDrawData::new(
-                    ctx.render_ctx,
+                    render_ctx,
                     renderer::GenericSkyboxType::GradientDark,
                 )
                 .into(),
@@ -99,7 +100,7 @@ pub(crate) fn configure_background(
         BackgroundKind::GradientBright => (
             Some(
                 renderer::GenericSkyboxDrawData::new(
-                    ctx.render_ctx,
+                    render_ctx,
                     renderer::GenericSkyboxType::GradientBright,
                 )
                 .into(),

crates/re_space_view_spatial/src/ui.rs

@@ -435,6 +435,10 @@ pub fn picking(
         return Ok(response);
     };
 
+    let Some(render_ctx) = ctx.render_ctx else {
+        return Err(SpaceViewSystemExecutionError::NoRenderContextError);
+    };
+
     let picking_context = PickingContext::new(
         pointer_pos_ui,
         space_from_ui,
@@ -453,7 +457,7 @@ pub fn picking(
         .at_most(128.0) as u32;
 
     let _ = view_builder.schedule_picking_rect(
-        ctx.render_ctx,
+        render_ctx,
         re_renderer::RectInt::from_middle_and_extent(
             picking_context.pointer_in_pixel.as_ivec2(),
             glam::uvec2(picking_rect_size, picking_rect_size),
@@ -467,7 +471,7 @@ pub fn picking(
     let images = visualizers.get::<ImageVisualizer>()?;
 
     let picking_result = picking_context.pick(
-        ctx.render_ctx,
+        render_ctx,
         query.space_view_id.gpu_readback_id(),
         &state.previous_picking_result,
         &images.images,
@@ -699,6 +703,10 @@ fn image_hover_ui(
         );
     }
 
+    let Some(render_ctx) = ctx.render_ctx else {
+        return;
+    };
+
     if let Some([h, w, ..]) = tensor.image_height_width_channels() {
         ui.separator();
         ui.horizontal(|ui| {
@@ -726,7 +734,7 @@ fn image_hover_ui(
                         c.entry(tensor_data_row_id, &decoded_tensor)
                     });
                     show_zoomed_image_region(
-                        ctx.render_ctx,
+                        render_ctx,
                         ui,
                         tensor_data_row_id,
                         &decoded_tensor,

crates/re_space_view_spatial/src/ui_2d.rs

@@ -193,6 +193,10 @@ pub fn view_2d(
         return Ok(());
     }
 
+    let Some(render_ctx) = ctx.render_ctx else {
+        return Err(SpaceViewSystemExecutionError::NoRenderContextError);
+    };
+
     // TODO(emilk): some way to visualize the resolution rectangle of the pinhole camera (in case there is no image logged).
 
     // Note that we can't rely on the camera being part of scene.space_cameras since that requires
@@ -246,7 +250,7 @@ pub fn view_2d(
         return Ok(());
     };
 
-    let mut view_builder = ViewBuilder::new(ctx.render_ctx, target_config);
+    let mut view_builder = ViewBuilder::new(render_ctx, target_config);
 
     // Create labels now since their shapes participate are added to scene.ui for picking.
     let (label_shapes, ui_rects) = create_labels(
@@ -283,7 +287,7 @@ pub fn view_2d(
     let background = re_viewport_blueprint::view_property::<Background>(ctx, query.space_view_id)
         .unwrap_or(Background::DEFAULT_2D);
     let (background_drawable, clear_color) = crate::configure_background(
-        ctx,
+        render_ctx,
         background.kind,
         background.color.unwrap_or(Background::DEFAULT_COLOR_2D),
     );
@@ -295,7 +299,7 @@ pub fn view_2d(
 
     if let Some(mode) = screenshot_context_menu(ctx, &response) {
         view_builder
-            .schedule_screenshot(ctx.render_ctx, query.space_view_id.gpu_readback_id(), mode)
+            .schedule_screenshot(render_ctx, query.space_view_id.gpu_readback_id(), mode)
             .ok();
     }
 

crates/re_space_view_spatial/src/ui_3d.rs

@@ -441,6 +441,10 @@ pub fn view_3d(
         draw_data,
     } = system_output;
 
+    let Some(render_ctx) = ctx.render_ctx else {
+        return Err(SpaceViewSystemExecutionError::NoRenderContextError);
+    };
+
     let highlights = &query.highlights;
     let space_cameras = &parts.get::<CamerasVisualizer>()?.space_cameras;
     // TODO(#5607): what should happen if the promise is still pending?
@@ -467,7 +471,7 @@ pub fn view_3d(
     let eye = view_eye.to_eye();
 
     // Various ui interactions draw additional lines.
-    let mut line_builder = LineDrawableBuilder::new(ctx.render_ctx);
+    let mut line_builder = LineDrawableBuilder::new(render_ctx);
     line_builder.radius_boost_in_ui_points_for_outlines(SIZE_BOOST_IN_POINTS_FOR_LINE_OUTLINES);
     // We don't know ahead of time how many lines we need, but it's not gonna be a huge amount!
     line_builder.reserve_strips(32)?;
@@ -519,7 +523,7 @@ pub fn view_3d(
             .then(|| outline_config(ui.ctx())),
     };
 
-    let mut view_builder = ViewBuilder::new(ctx.render_ctx, target_config);
+    let mut view_builder = ViewBuilder::new(render_ctx, target_config);
 
     // Create labels now since their shapes participate are added to scene.ui for picking.
     let (label_shapes, ui_rects) = create_labels(
@@ -610,7 +614,7 @@ pub fn view_3d(
     // Screenshot context menu.
     if let Some(mode) = screenshot_context_menu(ctx, &response) {
         view_builder
-            .schedule_screenshot(ctx.render_ctx, query.space_view_id.gpu_readback_id(), mode)
+            .schedule_screenshot(render_ctx, query.space_view_id.gpu_readback_id(), mode)
             .ok();
     }
 
@@ -668,7 +672,7 @@ pub fn view_3d(
     let background = re_viewport_blueprint::view_property::<Background>(ctx, query.space_view_id)
         .unwrap_or(Background::DEFAULT_3D);
     let (background_drawable, clear_color) = crate::configure_background(
-        ctx,
+        render_ctx,
         background.kind,
         background.color.unwrap_or(Background::DEFAULT_COLOR_3D),
     );

crates/re_space_view_spatial/src/visualizers/arrows2d.rs

@@ -212,7 +212,11 @@ impl VisualizerSystem for Arrows2DVisualizer {
         view_query: &ViewQuery<'_>,
         view_ctx: &ViewContextCollection,
     ) -> Result<Vec<re_renderer::QueueableDrawData>, SpaceViewSystemExecutionError> {
-        let mut line_builder = LineDrawableBuilder::new(ctx.render_ctx);
+        let Some(render_ctx) = ctx.render_ctx else {
+            return Err(SpaceViewSystemExecutionError::NoRenderContextError);
+        };
+
+        let mut line_builder = LineDrawableBuilder::new(render_ctx);
         line_builder.radius_boost_in_ui_points_for_outlines(SIZE_BOOST_IN_POINTS_FOR_LINE_OUTLINES);
 
         super::entity_iterator::process_archetype::<Self, Arrows2D, _>(

crates/re_space_view_spatial/src/visualizers/arrows3d.rs

@@ -215,7 +215,11 @@ impl VisualizerSystem for Arrows3DVisualizer {
         view_query: &ViewQuery<'_>,
         view_ctx: &ViewContextCollection,
     ) -> Result<Vec<re_renderer::QueueableDrawData>, SpaceViewSystemExecutionError> {
-        let mut line_builder = LineDrawableBuilder::new(ctx.render_ctx);
+        let Some(render_ctx) = ctx.render_ctx else {
+            return Err(SpaceViewSystemExecutionError::NoRenderContextError);
+        };
+
+        let mut line_builder = LineDrawableBuilder::new(render_ctx);
         line_builder.radius_boost_in_ui_points_for_outlines(SIZE_BOOST_IN_POINTS_FOR_LINE_OUTLINES);
 
         super::entity_iterator::process_archetype::<Self, Arrows3D, _>(

crates/re_space_view_spatial/src/visualizers/assets3d.rs

@@ -2,6 +2,7 @@ use re_entity_db::EntityPath;
 use re_log_types::{Instance, RowId, TimeInt};
 use re_query::range_zip_1x2;
 use re_renderer::renderer::MeshInstance;
+use re_renderer::RenderContext;
 use re_types::{
     archetypes::Asset3D,
     components::{Blob, MediaType, OutOfTreeTransform3D},
@@ -44,6 +45,7 @@ impl Asset3DVisualizer {
     fn process_data<'a>(
         &mut self,
         ctx: &ViewerContext<'_>,
+        render_ctx: &RenderContext,
         instances: &mut Vec<MeshInstance>,
         entity_path: &EntityPath,
         ent_context: &SpatialSceneEntityContext<'_>,
@@ -73,7 +75,7 @@ impl Asset3DVisualizer {
                         media_type: data.media_type.cloned(),
                     },
                     AnyMesh::Asset(&mesh),
-                    ctx.render_ctx,
+                    render_ctx,
                 )
             });
 
@@ -133,6 +135,10 @@ impl VisualizerSystem for Asset3DVisualizer {
         view_query: &ViewQuery<'_>,
         view_ctx: &ViewContextCollection,
     ) -> Result<Vec<re_renderer::QueueableDrawData>, SpaceViewSystemExecutionError> {
+        let Some(render_ctx) = ctx.render_ctx else {
+            return Err(SpaceViewSystemExecutionError::NoRenderContextError);
+        };
+
         let mut instances = Vec::new();
 
         super::entity_iterator::process_archetype::<Self, Asset3D, _>(
@@ -169,12 +175,19 @@ impl VisualizerSystem for Asset3DVisualizer {
                     })
                 });
 
-                self.process_data(ctx, &mut instances, entity_path, spatial_ctx, data);
+                self.process_data(
+                    ctx,
+                    render_ctx,
+                    &mut instances,
+                    entity_path,
+                    spatial_ctx,
+                    data,
+                );
                 Ok(())
             },
         )?;
 
-        match re_renderer::renderer::MeshDrawData::new(ctx.render_ctx, &instances) {
+        match re_renderer::renderer::MeshDrawData::new(render_ctx, &instances) {
             Ok(draw_data) => Ok(vec![draw_data.into()]),
             Err(err) => {
                 re_log::error_once!("Failed to create mesh draw data from mesh instances: {err}");

crates/re_space_view_spatial/src/visualizers/boxes2d.rs

@@ -208,7 +208,11 @@ impl VisualizerSystem for Boxes2DVisualizer {
         view_query: &ViewQuery<'_>,
         view_ctx: &ViewContextCollection,
     ) -> Result<Vec<re_renderer::QueueableDrawData>, SpaceViewSystemExecutionError> {
-        let mut line_builder = LineDrawableBuilder::new(ctx.render_ctx);
+        let Some(render_ctx) = ctx.render_ctx else {
+            return Err(SpaceViewSystemExecutionError::NoRenderContextError);
+        };
+
+        let mut line_builder = LineDrawableBuilder::new(render_ctx);
         line_builder.radius_boost_in_ui_points_for_outlines(SIZE_BOOST_IN_POINTS_FOR_LINE_OUTLINES);
 
         super::entity_iterator::process_archetype::<Self, Boxes2D, _>(

crates/re_space_view_spatial/src/visualizers/boxes3d.rs

@@ -199,7 +199,11 @@ impl VisualizerSystem for Boxes3DVisualizer {
         view_query: &ViewQuery<'_>,
         view_ctx: &ViewContextCollection,
     ) -> Result<Vec<re_renderer::QueueableDrawData>, SpaceViewSystemExecutionError> {
-        let mut line_builder = LineDrawableBuilder::new(ctx.render_ctx);
+        let Some(render_ctx) = ctx.render_ctx else {
+            return Err(SpaceViewSystemExecutionError::NoRenderContextError);
+        };
+
+        let mut line_builder = LineDrawableBuilder::new(render_ctx);
         line_builder.radius_boost_in_ui_points_for_outlines(SIZE_BOOST_IN_POINTS_FOR_LINE_OUTLINES);
 
         super::entity_iterator::process_archetype::<Self, Boxes3D, _>(

crates/re_space_view_spatial/src/visualizers/cameras.rs

@@ -206,11 +206,15 @@ impl VisualizerSystem for CamerasVisualizer {
         query: &ViewQuery<'_>,
         view_ctx: &ViewContextCollection,
     ) -> Result<Vec<re_renderer::QueueableDrawData>, SpaceViewSystemExecutionError> {
+        let Some(render_ctx) = ctx.render_ctx else {
+            return Err(SpaceViewSystemExecutionError::NoRenderContextError);
+        };
+
         let transforms = view_ctx.get::<TransformContext>()?;
 
         // Counting all cameras ahead of time is a bit wasteful, but we also don't expect a huge amount,
         // so let re_renderer's allocator internally decide what buffer sizes to pick & grow them as we go.
-        let mut line_builder = re_renderer::LineDrawableBuilder::new(ctx.render_ctx);
+        let mut line_builder = re_renderer::LineDrawableBuilder::new(render_ctx);
         line_builder.radius_boost_in_ui_points_for_outlines(SIZE_BOOST_IN_POINTS_FOR_LINE_OUTLINES);
 
         for data_result in query.iter_visible_data_results(ctx, Self::identifier()) {