Add target_frame to SpatialInformation

Author: grtlr

crates/store/re_types/definitions/rerun/blueprint/archetypes/spatial_information.fbs

@@ -4,6 +4,11 @@ namespace rerun.blueprint.archetypes;
 table SpatialInformation (
     "attr.rerun.scope": "blueprint"
 ) {
+  /// The target reference frame for all transformations.
+  ///
+  /// Defaults to the frame derived from the space origin.
+  target_frame: rerun.components.TransformFrameId ("attr.rerun.component_optional", order: 50);
+
   /// Whether axes should be shown at the origin.
   show_axes: rerun.blueprint.components.Enabled ("attr.rerun.component_optional", nullable, order: 100);
 

crates/store/re_types/src/blueprint/archetypes/spatial_information.rs

@@ -48,8 +48,8 @@ use re_types::{
         AggregationPolicy, AlbedoFactor, AxisLength, Color, DepthMeter, DrawOrder, FillMode,
         FillRatio, GammaCorrection, GraphType, ImagePlaneDistance, LinearSpeed,
         MagnificationFilter, MarkerSize, Name, Opacity, Position2D, Position3D, Range1D, Scale3D,
-        SeriesVisible, ShowLabels, StrokeWidth, Text, Timestamp, TransformRelation, Translation3D,
-        ValueRange, Vector3D, VideoCodec, Visible,
+        SeriesVisible, ShowLabels, StrokeWidth, Text, Timestamp, TransformFrameId,
+        TransformRelation, Translation3D, ValueRange, Vector3D, VideoCodec, Visible,
     },
 };
 use re_viewer_context::gpu_bridge::colormap_edit_or_view_ui;
@@ -121,6 +121,7 @@ pub fn create_component_ui_registry() -> re_viewer_context::ComponentUiRegistry
     registry.add_multiline_edit_or_view::<Text>(edit_multiline_string);
     registry.add_singleline_edit_or_view::<Name>(edit_singleline_string);
     registry.add_multiline_edit_or_view::<Name>(edit_multiline_string);
+    registry.add_singleline_edit_or_view::<TransformFrameId>(edit_singleline_string);
 
     // Enums:
     // TODO(#6974): Enums editors trivial and always the same, provide them automatically!

crates/store/re_types/src/reflection/mod.rs

@@ -4,12 +4,13 @@ use nohash_hasher::IntMap;
 use re_chunk_store::LatestAtQuery;
 use re_log_types::EntityPathHash;
 use re_tf::{TransformFrameId, TransformFrameIdHash};
-use re_types::{archetypes, components::ImagePlaneDistance};
+use re_types::{archetypes, blueprint, components::ImagePlaneDistance};
 use re_view::{DataResultQuery as _, latest_at_with_blueprint_resolved_data};
 use re_viewer_context::{
     DataResult, IdentifiedViewSystem, ViewContext, ViewContextSystem,
     ViewContextSystemOncePerFrameResult, typed_fallback_for,
 };
+use re_viewport_blueprint::ViewProperty;
 use vec1::smallvec_v1::SmallVec1;
 
 use crate::caches::TransformDatabaseStoreCache;
@@ -106,8 +107,35 @@ impl ViewContextSystem for TransformTreeContext {
         // Currently, we don't keep it around during the frame, but we may do so in the future.
         self.entity_transform_id_mapping = EntityTransformIdMapping::new(ctx, query);
 
-        // Target frame is the coordinate frame of the space origin entity.
-        self.target_frame = self.transform_frame_id_for(query.space_origin.hash());
+        // Target frame - check for blueprint override first, otherwise use space origin's coordinate frame.
+        self.target_frame = {
+            let spatial_info_prop = ViewProperty::from_archetype::<
+                blueprint::archetypes::SpatialInformation,
+            >(
+                ctx.blueprint_db(), ctx.blueprint_query(), ctx.view_id
+            );
+
+            let target_frame_component = spatial_info_prop
+                .component_or_fallback::<TransformFrameId>(
+                    ctx,
+                    blueprint::archetypes::SpatialInformation::descriptor_target_frame().component,
+                );
+
+            match target_frame_component {
+                Ok(target_frame) => {
+                    let target_frame_str = target_frame.as_str();
+                    if !target_frame_str.is_empty() {
+                        TransformFrameIdHash::from_str(target_frame.as_str())
+                    } else {
+                        self.transform_frame_id_for(query.space_origin.hash())
+                    }
+                }
+                Err(err) => {
+                    re_log::error_once!("Failed to query target frame: {err}");
+                    self.transform_frame_id_for(query.space_origin.hash())
+                }
+            }
+        };
 
         let latest_at_query = query.latest_at_query();
 

crates/viewer/re_component_ui/src/lib.rs

@@ -1,4 +1,4 @@
-use re_types::{archetypes, components, image::ImageKind};
+use re_types::{archetypes, blueprint, components, image::ImageKind};
 use re_view::DataResultQuery as _;
 use re_viewer_context::{IdentifiedViewSystem as _, QueryContext, ViewStateExt as _};
 
@@ -123,4 +123,23 @@ pub fn register_fallbacks(system_registry: &mut re_viewer_context::ViewSystemReg
             components::ShowLabels(false.into())
         },
     );
+
+    // Target reference frame - fallback to the computed value from view state
+    //
+    // An empty string signals that nothing has been set yet.
+    system_registry.register_fallback_provider(
+        blueprint::archetypes::SpatialInformation::descriptor_target_frame().component,
+        |ctx| {
+            let Ok(state) = ctx.view_state().downcast_ref::<SpatialViewState>() else {
+                return components::TransformFrameId(String::new().into());
+            };
+
+            // Return the computed target frame from the view state
+            state
+                .target_frame
+                .as_ref()
+                .map(|frame_str| components::TransformFrameId(frame_str.clone().into()))
+                .unwrap_or_else(|| components::TransformFrameId(String::new().into()))
+        },
+    );
 }

crates/viewer/re_view_spatial/src/contexts/transform_tree_context.rs

@@ -15,7 +15,7 @@ use re_viewer_context::{
 };
 
 use crate::{
-    contexts::{register_spatial_contexts, TransformTreeContext},
+    contexts::{TransformTreeContext, register_spatial_contexts},
     heuristics::default_visualized_entities_for_visualizer_kind,
     max_image_dimension_subscriber::{ImageTypes, MaxDimensions},
     shared_fallbacks,
@@ -291,19 +291,6 @@ impl ViewClass for SpatialView2D {
         let state = state.downcast_mut::<SpatialViewState>()?;
         // TODO(andreas): list_item'ify the rest
         ui.selection_grid("spatial_settings_ui").show(ui, |ui| {
-            if ctx.app_options().experimental_coordinate_frame_display_and_override {
-                ui.grid_left_hand_label("Target frame")
-                    .on_hover_text("The coordinate frame that transforms are resolved to");
-                ui.vertical(|ui| {
-                    if let Some(target_frame) = &state.target_frame {
-                        ui.label(target_frame);
-                    } else {
-                        ui.weak("(unknown)");
-                    }
-                });
-                ui.end_row();
-            }
-
             state.bounding_box_ui(ui, SpatialViewKind::TwoD);
         });
 

crates/viewer/re_view_spatial/src/shared_fallbacks.rs

@@ -28,7 +28,7 @@ use re_viewer_context::{
 use re_viewport_blueprint::ViewProperty;
 
 use crate::{
-    contexts::{register_spatial_contexts, TransformTreeContext},
+    contexts::{TransformTreeContext, register_spatial_contexts},
     heuristics::default_visualized_entities_for_visualizer_kind,
     spatial_topology::{HeuristicHints, SpatialTopology, SubSpaceConnectionFlags},
     ui::SpatialViewState,
@@ -575,19 +575,6 @@ impl ViewClass for SpatialView3D {
             });
             ui.end_row();
 
-            if ctx.app_options().experimental_coordinate_frame_display_and_override {
-                ui.grid_left_hand_label("Target frame")
-                    .on_hover_text("The coordinate frame that transforms are resolved to");
-                ui.vertical(|ui| {
-                    if let Some(target_frame) = &state.target_frame {
-                        ui.label(target_frame);
-                    } else {
-                        ui.weak("(unknown)");
-                    }
-                });
-                ui.end_row();
-            }
-
             state.bounding_box_ui(ui, SpatialViewKind::ThreeD);
 
             #[cfg(debug_assertions)]
@@ -596,10 +583,10 @@ impl ViewClass for SpatialView3D {
 
         re_ui::list_item::list_item_scope(ui, "spatial_view3d_selection_ui", |ui| {
             let view_ctx = self.view_context(ctx, view_id, state);
+            view_property_ui::<SpatialInformation>(&view_ctx, ui);
             view_property_ui::<EyeControls3D>(&view_ctx, ui);
             view_property_ui::<Background>(&view_ctx, ui);
             view_property_ui_grid3d(&view_ctx, ui);
-            view_property_ui::<SpatialInformation>(&view_ctx, ui);
         });
 
         Ok(())

crates/viewer/re_view_spatial/src/view_2d.rs

@@ -41,6 +41,7 @@
             color=[255, 255, 255, 128],  # Colors the grid a half-transparent white.
         ),
         spatial_information=rrb.SpatialInformation(
+            target_frame="tf#/",
             show_axes=True,
             show_bounding_box=True,
         ),