Use in fallbacks

checkpoint

Author: grtlr

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

@@ -7,7 +7,7 @@ use re_renderer::DepthOffset;
 use re_types::ViewClassIdentifier;
 use re_view::AnnotationSceneContext;
 use re_viewer_context::{Annotations, ViewClassRegistryError};
-pub use transform_tree_context::{TransformInfo, TransformTreeContext, UNKNOWN_SPACE_ORIGIN};
+pub use transform_tree_context::{TransformInfo, TransformTreeContext};
 
 /// Context objects for a single entity in a spatial scene.
 pub struct SpatialSceneEntityContext<'a> {

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

@@ -16,12 +16,6 @@ use vec1::smallvec_v1::SmallVec1;
 
 type FrameIdMapping = IntMap<TransformFrameIdHash, TransformFrameId>;
 
-/// Currently, there is no straightforward way to retrieve the space origin
-/// when registering fallbacks. So, if unknown we set the target frame to a
-/// dummy string and rely on the view to supply that information after the
-/// first frame.
-pub const UNKNOWN_SPACE_ORIGIN: &str = "<unknown space origin>";
-
 /// Details on how to transform an entity (!) to the origin of the view's space.
 #[derive(Clone, Debug, PartialEq)]
 pub struct TransformInfo {
@@ -208,14 +202,7 @@ impl ViewContextSystem for TransformTreeContext {
                 );
 
             match target_frame_component {
-                Ok(target_frame) => {
-                    let target_frame_str = target_frame.as_str();
-                    if target_frame_str == UNKNOWN_SPACE_ORIGIN {
-                        self.transform_frame_id_for(query.space_origin.hash())
-                    } else {
-                        TransformFrameIdHash::from_str(target_frame.as_str())
-                    }
-                }
+                Ok(target_frame) => TransformFrameIdHash::from_str(target_frame.as_str()),
                 Err(err) => {
                     re_log::error_once!("Failed to query target frame: {err}");
                     self.transform_frame_id_for(query.space_origin.hash())

crates/viewer/re_view_spatial/src/shared_fallbacks.rs

@@ -1,5 +1,5 @@
 use re_types::image::ImageKind;
-use re_types::{archetypes, components};
+use re_types::{archetypes, blueprint, components};
 use re_view::DataResultQuery as _;
 use re_viewer_context::{IdentifiedViewSystem as _, QueryContext, ViewStateExt as _};
 
@@ -124,4 +124,30 @@ pub fn register_fallbacks(system_registry: &mut re_viewer_context::ViewSystemReg
             components::ShowLabels(false.into())
         },
     );
+
+    system_registry.register_fallback_provider(
+        blueprint::archetypes::SpatialInformation::descriptor_target_frame().component,
+        |ctx| {
+            // Query the actual coordinate frame for the space origin entity.
+            // This respects explicit CoordinateFrame components rather than just deriving from entity path.
+            let space_origin = ctx.view_ctx.space_origin;
+            let query_result = ctx.viewer_ctx().lookup_query_result(ctx.view_ctx.view_id);
+
+            if let Some(data_result) = query_result.tree.lookup_result_by_path(space_origin.hash())
+            {
+                let results = data_result.latest_at_with_blueprint_resolved_data::<
+                    archetypes::CoordinateFrame,
+                >(ctx.view_ctx, ctx.query);
+
+                if let Some(frame_id) = results.get_mono::<components::TransformFrameId>(
+                    archetypes::CoordinateFrame::descriptor_frame().component,
+                ) {
+                    return frame_id;
+                }
+            }
+
+            // Fallback to entity path if no explicit CoordinateFrame
+            components::TransformFrameId::from_entity_path(space_origin)
+        },
+    );
 }

crates/viewer/re_view_spatial/src/ui.rs

@@ -63,10 +63,6 @@ pub struct SpatialViewState {
     pub pinhole_at_origin: Option<Pinhole>,
 
     pub visual_bounds_2d: Option<VisualBounds2D>,
-
-    /// The target frame, i.e., the coordinate frame that transforms are resolved to.
-    /// Computed from the space origin via the transform tree.
-    pub target_frame: Option<String>,
 }
 
 impl ViewState for SpatialViewState {

crates/viewer/re_view_spatial/src/view_2d.rs

@@ -10,7 +10,7 @@ use re_viewer_context::{
     ViewSpawnHeuristics, ViewState, ViewStateExt as _, ViewSystemExecutionError, ViewerContext,
 };
 
-use crate::contexts::{TransformTreeContext, register_spatial_contexts};
+use crate::contexts::register_spatial_contexts;
 use crate::heuristics::default_visualized_entities_for_visualizer_kind;
 use crate::max_image_dimension_subscriber::{ImageTypes, MaxDimensions};
 use crate::shared_fallbacks;
@@ -255,11 +255,6 @@ impl ViewClass for SpatialView2D {
         let state = state.downcast_mut::<SpatialViewState>()?;
         state.update_frame_statistics(ui, &system_output, SpatialViewKind::TwoD);
 
-        // Store the target frame for display in the selection panel
-        if let Ok(transforms) = system_output.context_systems.get::<TransformTreeContext>() {
-            state.target_frame = Some(transforms.format_frame(transforms.target_frame()));
-        }
-
         self.view_2d(ctx, ui, state, query, system_output)
     }
 }

crates/viewer/re_view_spatial/src/view_3d.rs

@@ -22,7 +22,7 @@ use re_viewer_context::{
 };
 use re_viewport_blueprint::ViewProperty;
 
-use crate::contexts::{TransformTreeContext, UNKNOWN_SPACE_ORIGIN, register_spatial_contexts};
+use crate::contexts::register_spatial_contexts;
 use crate::heuristics::default_visualized_entities_for_visualizer_kind;
 use crate::shared_fallbacks;
 use crate::spatial_topology::{HeuristicHints, SpatialTopology, SubSpaceConnectionFlags};
@@ -244,24 +244,6 @@ impl ViewClass for SpatialView3D {
             },
         );
 
-        system_registry.register_fallback_provider(
-            SpatialInformation::descriptor_target_frame().component,
-            |ctx| {
-                let unknown_space_origin = || TransformFrameId(UNKNOWN_SPACE_ORIGIN.into());
-
-                let Ok(state) = ctx.view_state().downcast_ref::<SpatialViewState>() else {
-                    return unknown_space_origin();
-                };
-
-                // Return the computed target frame from the view state
-                state
-                    .target_frame
-                    .as_ref()
-                    .map(|frame_str| TransformFrameId(frame_str.clone().into()))
-                    .unwrap_or_else(unknown_space_origin)
-            },
-        );
-
         shared_fallbacks::register_fallbacks(system_registry);
 
         // Ensure spatial topology is registered.
@@ -549,11 +531,6 @@ impl ViewClass for SpatialView3D {
         let state = state.downcast_mut::<SpatialViewState>()?;
         state.update_frame_statistics(ui, &system_output, SpatialViewKind::ThreeD);
 
-        // Store the target frame for display in the selection panel
-        if let Ok(transforms) = system_output.context_systems.get::<TransformTreeContext>() {
-            state.target_frame = Some(transforms.format_frame(transforms.target_frame()));
-        }
-
         self.view_3d(ctx, ui, state, query, system_output)
     }
 }