diff --git a/.vscode/settings.json b/.vscode/settings.json
index fc273709cb4c..e4341b2a74ac 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -24,6 +24,7 @@
     "cSpell.words": [
         "andreas",
         "bbox",
+        "emath",
         "framebuffer",
         "hoverable",
         "Keypoint",
diff --git a/crates/re_renderer/shader/point_cloud.wgsl b/crates/re_renderer/shader/point_cloud.wgsl
index 85a4f2e085b8..7eae6f162dda 100644
--- a/crates/re_renderer/shader/point_cloud.wgsl
+++ b/crates/re_renderer/shader/point_cloud.wgsl
@@ -157,7 +157,7 @@ fn fs_main(in: VertexOut) -> @location(0) Vec4 {
 
     // Sphere intersection with anti-aliasing as described by Iq here
     // https://www.shadertoy.com/view/MsSSWV
-    // (but rearranged and labled to it's easier to understand!)
+    // (but rearranged and labeled to it's easier to understand!)
     let d = sphere_distance(ray, in.point_center, in.radius);
     let smallest_distance_to_sphere = d.x;
     let closest_ray_dist = d.y;
diff --git a/crates/re_viewer/src/ui/view_spatial/mod.rs b/crates/re_viewer/src/ui/view_spatial/mod.rs
index eb74729ff5d6..141f6c3f9dd6 100644
--- a/crates/re_viewer/src/ui/view_spatial/mod.rs
+++ b/crates/re_viewer/src/ui/view_spatial/mod.rs
@@ -7,9 +7,7 @@ mod ui_2d;
 mod ui_3d;
 mod ui_renderer_bridge;
 
-pub use self::scene::{
-    Image, Label2D, Label2DTarget, Label3D, MeshSource, MeshSourceData, SceneSpatial,
-};
+pub use self::scene::{Image, MeshSource, MeshSourceData, SceneSpatial, UiLabel, UiLabelTarget};
 pub use self::space_camera_3d::SpaceCamera3D;
 pub use ui::{SpatialNavigationMode, ViewSpatialState};
 pub use ui_2d::view_2d;
diff --git a/crates/re_viewer/src/ui/view_spatial/scene/mod.rs b/crates/re_viewer/src/ui/view_spatial/scene/mod.rs
index 84376f4994c2..f0a3b0f94155 100644
--- a/crates/re_viewer/src/ui/view_spatial/scene/mod.rs
+++ b/crates/re_viewer/src/ui/view_spatial/scene/mod.rs
@@ -74,38 +74,32 @@ pub struct Image {
     pub annotations: Arc<Annotations>,
 }
 
-pub enum Label2DTarget {
+pub enum UiLabelTarget {
     /// Labels a given rect (in scene coordinates)
     Rect(egui::Rect),
 
     /// Labels a given point (in scene coordinates)
-    Point(egui::Pos2),
+    Point2D(egui::Pos2),
+
+    /// A point in space.
+    Position3D(glam::Vec3),
 }
 
-// TODO(andreas): Merge Label2D and Label3D
-pub struct Label2D {
+pub struct UiLabel {
     pub text: String,
     pub color: Color32,
 
-    /// The shape being labeled.
-    pub target: Label2DTarget,
+    /// The shape/position being labeled.
+    pub target: UiLabelTarget,
 
     /// What is hovered if this label is hovered.
-    pub labled_instance: InstancePathHash,
-}
-
-pub struct Label3D {
-    pub(crate) text: String,
-
-    /// Origin of the label
-    pub(crate) origin: glam::Vec3,
+    pub labeled_instance: InstancePathHash,
 }
 
 /// Data necessary to setup the ui [`SceneSpatial`] but of no interest to `re_renderer`.
 #[derive(Default)]
 pub struct SceneSpatialUiData {
-    pub labels_3d: Vec<Label3D>,
-    pub labels_2d: Vec<Label2D>,
+    pub labels: Vec<UiLabel>,
 
     /// Picking any any of these rects cause the referred instance to be hovered.
     /// Only use this for 2d overlays!
diff --git a/crates/re_viewer/src/ui/view_spatial/scene/scene_part/boxes2d.rs b/crates/re_viewer/src/ui/view_spatial/scene/scene_part/boxes2d.rs
index 54c38ea77b08..f5ae78a22527 100644
--- a/crates/re_viewer/src/ui/view_spatial/scene/scene_part/boxes2d.rs
+++ b/crates/re_viewer/src/ui/view_spatial/scene/scene_part/boxes2d.rs
@@ -12,7 +12,7 @@ use crate::{
     ui::{
         scene::SceneQuery,
         view_spatial::{
-            scene::scene_part::instance_path_hash_for_picking, Label2D, Label2DTarget, SceneSpatial,
+            scene::scene_part::instance_path_hash_for_picking, SceneSpatial, UiLabel, UiLabelTarget,
         },
         DefaultColor,
     },
@@ -71,14 +71,14 @@ impl Boxes2DPart {
             .user_data(instance_path_hash);
 
         if let Some(label) = label {
-            scene.ui.labels_2d.push(Label2D {
+            scene.ui.labels.push(UiLabel {
                 text: label,
                 color,
-                target: Label2DTarget::Rect(egui::Rect::from_min_size(
+                target: UiLabelTarget::Rect(egui::Rect::from_min_size(
                     rect.top_left_corner().into(),
                     egui::vec2(rect.width(), rect.height()),
                 )),
-                labled_instance: instance_path_hash,
+                labeled_instance: instance_path_hash,
             });
         }
     }
diff --git a/crates/re_viewer/src/ui/view_spatial/scene/scene_part/boxes3d.rs b/crates/re_viewer/src/ui/view_spatial/scene/scene_part/boxes3d.rs
index 66b15e455eaf..a5435cb53793 100644
--- a/crates/re_viewer/src/ui/view_spatial/scene/scene_part/boxes3d.rs
+++ b/crates/re_viewer/src/ui/view_spatial/scene/scene_part/boxes3d.rs
@@ -12,7 +12,7 @@ use crate::{
     misc::{OptionalSpaceViewEntityHighlight, SpaceViewHighlights, TransformCache, ViewerContext},
     ui::{
         scene::SceneQuery,
-        view_spatial::{Label3D, SceneSpatial},
+        view_spatial::{SceneSpatial, UiLabel, UiLabelTarget},
         DefaultColor,
     },
 };
@@ -82,9 +82,11 @@ impl Boxes3DPart {
                 .user_data(instance_hash);
 
             if let Some(label) = annotation_info.label(label.as_ref().map(|s| &s.0)) {
-                scene.ui.labels_3d.push(Label3D {
+                scene.ui.labels.push(UiLabel {
                     text: label,
-                    origin: world_from_obj.transform_point3(tran),
+                    target: UiLabelTarget::Position3D(world_from_obj.transform_point3(tran)),
+                    color,
+                    labeled_instance: instance_hash,
                 });
             }
         };
diff --git a/crates/re_viewer/src/ui/view_spatial/scene/scene_part/points2d.rs b/crates/re_viewer/src/ui/view_spatial/scene/scene_part/points2d.rs
index e5bef22be8c3..8a81b4cacd17 100644
--- a/crates/re_viewer/src/ui/view_spatial/scene/scene_part/points2d.rs
+++ b/crates/re_viewer/src/ui/view_spatial/scene/scene_part/points2d.rs
@@ -12,7 +12,7 @@ use crate::{
     misc::{OptionalSpaceViewEntityHighlight, SpaceViewHighlights, TransformCache, ViewerContext},
     ui::{
         scene::SceneQuery,
-        view_spatial::{scene::Keypoints, Label2D, Label2DTarget, SceneSpatial},
+        view_spatial::{scene::Keypoints, SceneSpatial, UiLabel, UiLabelTarget},
         DefaultColor,
     },
 };
@@ -101,11 +101,11 @@ impl Points2DPart {
 
             if let Some(label) = label {
                 if label_batch.len() < max_num_labels {
-                    label_batch.push(Label2D {
+                    label_batch.push(UiLabel {
                         text: label,
                         color,
-                        target: Label2DTarget::Point(egui::pos2(pos.x, pos.y)),
-                        labled_instance: instance_hash,
+                        target: UiLabelTarget::Point2D(egui::pos2(pos.x, pos.y)),
+                        labeled_instance: instance_hash,
                     });
                 }
             }
@@ -115,7 +115,7 @@ impl Points2DPart {
         drop(point_batch); // Drop batch so we have access to the scene again (batches need to be dropped before starting new ones).
 
         if label_batch.len() < max_num_labels {
-            scene.ui.labels_2d.extend(label_batch.into_iter());
+            scene.ui.labels.extend(label_batch.into_iter());
         }
 
         // Generate keypoint connections if any.
diff --git a/crates/re_viewer/src/ui/view_spatial/scene/scene_part/points3d.rs b/crates/re_viewer/src/ui/view_spatial/scene/scene_part/points3d.rs
index b9fddeb1cff7..2eb72dd2f137 100644
--- a/crates/re_viewer/src/ui/view_spatial/scene/scene_part/points3d.rs
+++ b/crates/re_viewer/src/ui/view_spatial/scene/scene_part/points3d.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use ahash::{HashMap, HashMapExt};
 use glam::Mat4;
 
-use re_data_store::{EntityPath, EntityProperties};
+use re_data_store::{EntityPath, EntityProperties, InstancePathHash};
 use re_log_types::{
     component_types::{ClassId, ColorRGBA, InstanceKey, KeypointId, Label, Point3D, Radius},
     msg_bundle::Component,
@@ -21,7 +21,7 @@ use crate::{
         scene::SceneQuery,
         view_spatial::{
             scene::{scene_part::instance_path_hash_for_picking, Keypoints},
-            Label3D, SceneSpatial,
+            SceneSpatial, UiLabel, UiLabelTarget,
         },
         Annotations, DefaultColor,
     },
@@ -117,24 +117,34 @@ impl Points3DPart {
 
     fn process_labels<'a>(
         entity_view: &'a EntityView<Point3D>,
+        instance_path_hashes: &'a [InstancePathHash],
+        colors: &'a [egui::Color32],
         annotation_infos: &'a [ResolvedAnnotationInfo],
         world_from_obj: Mat4,
-    ) -> Result<impl Iterator<Item = Label3D> + 'a, QueryError> {
+    ) -> Result<impl Iterator<Item = UiLabel> + 'a, QueryError> {
         let labels = itertools::izip!(
             annotation_infos.iter(),
             entity_view.iter_primary()?,
-            entity_view.iter_component::<Label>()?
+            entity_view.iter_component::<Label>()?,
+            colors,
+            instance_path_hashes,
         )
-        .filter_map(move |(annotation_info, point, label)| {
-            let label = annotation_info.label(label.map(|l| l.0).as_ref());
-            match (point, label) {
-                (Some(point), Some(label)) => Some(Label3D {
-                    text: label,
-                    origin: world_from_obj.transform_point3(point.into()),
-                }),
-                _ => None,
-            }
-        });
+        .filter_map(
+            move |(annotation_info, point, label, color, labeled_instance)| {
+                let label = annotation_info.label(label.map(|l| l.0).as_ref());
+                match (point, label) {
+                    (Some(point), Some(label)) => Some(UiLabel {
+                        text: label,
+                        color: *color,
+                        target: UiLabelTarget::Position3D(
+                            world_from_obj.transform_point3(point.into()),
+                        ),
+                        labeled_instance: *labeled_instance,
+                    }),
+                    _ => None,
+                }
+            },
+        );
         Ok(labels)
     }
 
@@ -192,10 +202,20 @@ impl Points3DPart {
         let colors = Self::process_colors(entity_view, ent_path, &highlights, &annotation_infos)?;
 
         let radii = Self::process_radii(entity_view, &highlights)?;
-        let labels = Self::process_labels(entity_view, &annotation_infos, world_from_obj)?;
 
         if show_labels && instance_path_hashes.len() <= self.max_labels {
-            scene.ui.labels_3d.extend(labels);
+            // Max labels is small enough that we can afford iterating on the colors again.
+            let colors =
+                Self::process_colors(entity_view, ent_path, &highlights, &annotation_infos)?
+                    .collect::<Vec<_>>();
+
+            scene.ui.labels.extend(Self::process_labels(
+                entity_view,
+                &instance_path_hashes,
+                &colors,
+                &annotation_infos,
+                world_from_obj,
+            )?);
         }
 
         scene
diff --git a/crates/re_viewer/src/ui/view_spatial/ui.rs b/crates/re_viewer/src/ui/view_spatial/ui.rs
index 71cb6070858f..770994fed834 100644
--- a/crates/re_viewer/src/ui/view_spatial/ui.rs
+++ b/crates/re_viewer/src/ui/view_spatial/ui.rs
@@ -1,3 +1,4 @@
+use eframe::epaint::text::TextWrapping;
 use re_data_store::{query_latest_single, EditableAutoValue, EntityPath};
 use re_format::format_f32;
 
@@ -5,11 +6,16 @@ use egui::{NumExt, WidgetText};
 use macaw::BoundingBox;
 
 use crate::{
-    misc::{space_info::query_view_coordinates, SpaceViewHighlights, ViewerContext},
-    ui::{data_blueprint::DataBlueprintTree, SpaceViewId},
+    misc::{
+        space_info::query_view_coordinates, SelectionHighlight, SpaceViewHighlights, ViewerContext,
+    },
+    ui::{data_blueprint::DataBlueprintTree, view_spatial::UiLabelTarget, SpaceViewId},
 };
 
-use super::{ui_2d::View2DState, ui_3d::View3DState, SceneSpatial, SpaceSpecs};
+use super::{
+    eye::Eye, scene::SceneSpatialUiData, ui_2d::View2DState, ui_3d::View3DState, SceneSpatial,
+    SpaceSpecs,
+};
 
 /// Describes how the scene is navigated, determining if it is a 2D or 3D experience.
 #[derive(Clone, Copy, Default, PartialEq, Eq, serde::Deserialize, serde::Serialize)]
@@ -344,7 +350,7 @@ impl ViewSpatialState {
                 let coordinates =
                     query_view_coordinates(&ctx.log_db.entity_db, space, &ctx.current_query());
                 self.state_3d.space_specs = SpaceSpecs::from_view_coordinates(coordinates);
-                super::view_3d(ctx, ui, self, space, space_view_id, scene);
+                super::view_3d(ctx, ui, self, space, space_view_id, scene, highlights);
             }
             SpatialNavigationMode::TwoD => {
                 let scene_rect_accum = egui::Rect::from_min_max(
@@ -459,3 +465,94 @@ fn axis_name(axis: Option<glam::Vec3>) -> String {
         "—".to_owned()
     }
 }
+
+pub fn create_labels(
+    scene_ui: &mut SceneSpatialUiData,
+    ui_from_space2d: egui::emath::RectTransform,
+    space2d_from_ui: egui::emath::RectTransform,
+    eye3d: &Eye,
+    parent_ui: &mut egui::Ui,
+    highlights: &SpaceViewHighlights,
+) -> Vec<egui::Shape> {
+    crate::profile_function!();
+
+    let mut label_shapes = Vec::with_capacity(scene_ui.labels.len() * 2);
+
+    let ui_from_world_3d = eye3d.ui_from_world(ui_from_space2d.to());
+
+    for label in &scene_ui.labels {
+        let (wrap_width, text_anchor_pos) = match label.target {
+            UiLabelTarget::Rect(rect) => {
+                let rect_in_ui = ui_from_space2d.transform_rect(rect);
+                (
+                    // Place the text centered below the rect
+                    (rect_in_ui.width() - 4.0).at_least(60.0),
+                    rect_in_ui.center_bottom() + egui::vec2(0.0, 3.0),
+                )
+            }
+            UiLabelTarget::Point2D(pos) => {
+                let pos_in_ui = ui_from_space2d.transform_pos(pos);
+                (f32::INFINITY, pos_in_ui + egui::vec2(0.0, 3.0))
+            }
+            UiLabelTarget::Position3D(pos) => {
+                let pos_in_ui = ui_from_world_3d * pos.extend(1.0);
+                if pos_in_ui.w <= 0.0 {
+                    continue; // behind camera
+                }
+                let pos_in_ui = pos_in_ui / pos_in_ui.w;
+                (f32::INFINITY, egui::pos2(pos_in_ui.x, pos_in_ui.y))
+            }
+        };
+
+        let font_id = egui::TextStyle::Body.resolve(parent_ui.style());
+        let galley = parent_ui.fonts(|fonts| {
+            fonts.layout_job({
+                egui::text::LayoutJob {
+                    sections: vec![egui::text::LayoutSection {
+                        leading_space: 0.0,
+                        byte_range: 0..label.text.len(),
+                        format: egui::TextFormat::simple(font_id, label.color),
+                    }],
+                    text: label.text.clone(),
+                    wrap: TextWrapping {
+                        max_width: wrap_width,
+                        ..Default::default()
+                    },
+                    break_on_newline: true,
+                    halign: egui::Align::Center,
+                    ..Default::default()
+                }
+            })
+        });
+
+        let text_rect = egui::Align2::CENTER_TOP
+            .anchor_rect(egui::Rect::from_min_size(text_anchor_pos, galley.size()));
+        let bg_rect = text_rect.expand2(egui::vec2(4.0, 2.0));
+
+        let hightlight = highlights
+            .entity_highlight(label.labeled_instance.entity_path_hash)
+            .index_highlight(label.labeled_instance.instance_key);
+        let fill_color = match hightlight.hover {
+            crate::misc::HoverHighlight::None => match hightlight.selection {
+                SelectionHighlight::None => parent_ui.style().visuals.widgets.inactive.bg_fill,
+                SelectionHighlight::SiblingSelection => {
+                    parent_ui.style().visuals.widgets.active.bg_fill
+                }
+                SelectionHighlight::Selection => parent_ui.style().visuals.widgets.active.bg_fill,
+            },
+            crate::misc::HoverHighlight::Hovered => {
+                parent_ui.style().visuals.widgets.hovered.bg_fill
+            }
+        };
+
+        label_shapes.push(egui::Shape::rect_filled(bg_rect, 3.0, fill_color));
+        label_shapes.push(egui::Shape::galley(text_rect.center_top(), galley));
+
+        scene_ui.pickable_ui_rects.push((
+            space2d_from_ui.transform_rect(bg_rect),
+            label.labeled_instance,
+        ));
+    }
+
+    label_shapes
+}
diff --git a/crates/re_viewer/src/ui/view_spatial/ui_2d.rs b/crates/re_viewer/src/ui/view_spatial/ui_2d.rs
index 23be71806264..d0bc2c3f5c0e 100644
--- a/crates/re_viewer/src/ui/view_spatial/ui_2d.rs
+++ b/crates/re_viewer/src/ui/view_spatial/ui_2d.rs
@@ -1,25 +1,20 @@
-use eframe::{emath::RectTransform, epaint::text::TextWrapping};
+use eframe::emath::RectTransform;
 use egui::{
-    pos2, vec2, Align, Align2, Color32, NumExt as _, Pos2, Rect, Response, ScrollArea, Shape,
-    TextFormat, TextStyle, Vec2,
+    pos2, vec2, Align2, Color32, NumExt as _, Pos2, Rect, Response, ScrollArea, Shape, Vec2,
 };
 use macaw::IsoTransform;
 use re_data_store::EntityPath;
 use re_log_types::component_types::TensorTrait;
 use re_renderer::view_builder::TargetConfiguration;
 
-use super::{
-    eye::Eye,
-    scene::{AdditionalPickingInfo, SceneSpatialUiData},
-    ViewSpatialState,
-};
+use super::{eye::Eye, scene::AdditionalPickingInfo, ui::create_labels, ViewSpatialState};
 use crate::{
-    misc::{HoveredSpace, Item, SelectionHighlight, SpaceViewHighlights},
+    misc::{HoveredSpace, Item, SpaceViewHighlights},
     ui::{
         data_ui::{self, DataUi},
         view_spatial::{
             ui_renderer_bridge::{create_scene_paint_callback, get_viewport, ScreenBackground},
-            Label2DTarget, SceneSpatial,
+            SceneSpatial,
         },
         SpaceViewId, UiVerbosity,
     },
@@ -303,18 +298,21 @@ fn view_2d_scrollable(
         .state_2d
         .update(&response, space_from_ui, scene_rect_accum, available_size);
 
-    // ------------------------------------------------------------------------
+    let eye = Eye {
+        world_from_view: IsoTransform::IDENTITY,
+        fov_y: None,
+    };
 
+    // Create labels now since their shapes participate are added to scene.ui for picking.
     let label_shapes = create_labels(
         &mut scene.ui,
         ui_from_space,
         space_from_ui,
+        &eye,
         parent_ui,
         highlights,
     );
 
-    // ------------------------------------------------------------------------
-
     // Check if we're hovering any hover primitive.
     let mut depth_at_pointer = None;
     if let Some(pointer_pos_ui) = response.hover_pos() {
@@ -323,10 +321,7 @@ fn view_2d_scrollable(
         let picking_result = scene.picking(
             glam::vec2(pointer_pos_space.x, pointer_pos_space.y),
             &scene_rect_accum,
-            &Eye {
-                world_from_view: IsoTransform::IDENTITY,
-                fov_y: None,
-            },
+            &eye,
             hover_radius,
         );
 
@@ -467,85 +462,6 @@ fn view_2d_scrollable(
     response
 }
 
-fn create_labels(
-    scene_ui: &mut SceneSpatialUiData,
-    ui_from_space: RectTransform,
-    space_from_ui: RectTransform,
-    parent_ui: &mut egui::Ui,
-    highlights: &SpaceViewHighlights,
-) -> Vec<Shape> {
-    crate::profile_function!();
-
-    let mut label_shapes = Vec::with_capacity(scene_ui.labels_2d.len() * 2);
-
-    for label in &scene_ui.labels_2d {
-        let (wrap_width, text_anchor_pos) = match label.target {
-            Label2DTarget::Rect(rect) => {
-                let rect_in_ui = ui_from_space.transform_rect(rect);
-                (
-                    // Place the text centered below the rect
-                    (rect_in_ui.width() - 4.0).at_least(60.0),
-                    rect_in_ui.center_bottom() + vec2(0.0, 3.0),
-                )
-            }
-            Label2DTarget::Point(pos) => {
-                let pos_in_ui = ui_from_space.transform_pos(pos);
-                (f32::INFINITY, pos_in_ui + vec2(0.0, 3.0))
-            }
-        };
-
-        let font_id = TextStyle::Body.resolve(parent_ui.style());
-        let galley = parent_ui.fonts(|fonts| {
-            fonts.layout_job({
-                egui::text::LayoutJob {
-                    sections: vec![egui::text::LayoutSection {
-                        leading_space: 0.0,
-                        byte_range: 0..label.text.len(),
-                        format: TextFormat::simple(font_id, label.color),
-                    }],
-                    text: label.text.clone(),
-                    wrap: TextWrapping {
-                        max_width: wrap_width,
-                        ..Default::default()
-                    },
-                    break_on_newline: true,
-                    halign: Align::Center,
-                    ..Default::default()
-                }
-            })
-        });
-
-        let text_rect =
-            Align2::CENTER_TOP.anchor_rect(Rect::from_min_size(text_anchor_pos, galley.size()));
-        let bg_rect = text_rect.expand2(vec2(4.0, 2.0));
-
-        let hightlight = highlights
-            .entity_highlight(label.labled_instance.entity_path_hash)
-            .index_highlight(label.labled_instance.instance_key);
-        let fill_color = match hightlight.hover {
-            crate::misc::HoverHighlight::None => match hightlight.selection {
-                SelectionHighlight::None => parent_ui.style().visuals.widgets.inactive.bg_fill,
-                SelectionHighlight::SiblingSelection => {
-                    parent_ui.style().visuals.widgets.active.bg_fill
-                }
-                SelectionHighlight::Selection => parent_ui.style().visuals.widgets.active.bg_fill,
-            },
-            crate::misc::HoverHighlight::Hovered => {
-                parent_ui.style().visuals.widgets.hovered.bg_fill
-            }
-        };
-
-        label_shapes.push(Shape::rect_filled(bg_rect, 3.0, fill_color));
-        label_shapes.push(Shape::galley(text_rect.center_top(), galley));
-
-        scene_ui
-            .pickable_ui_rects
-            .push((space_from_ui.transform_rect(bg_rect), label.labled_instance));
-    }
-
-    label_shapes
-}
-
 fn setup_target_config(
     painter: &egui::Painter,
     space_from_ui: RectTransform,
diff --git a/crates/re_viewer/src/ui/view_spatial/ui_3d.rs b/crates/re_viewer/src/ui/view_spatial/ui_3d.rs
index 88590aba0cb7..94fed1a3e9e4 100644
--- a/crates/re_viewer/src/ui/view_spatial/ui_3d.rs
+++ b/crates/re_viewer/src/ui/view_spatial/ui_3d.rs
@@ -1,3 +1,4 @@
+use eframe::emath::RectTransform;
 use egui::NumExt as _;
 use glam::Affine3A;
 use macaw::{vec3, BoundingBox, Quat, Vec3};
@@ -10,11 +11,12 @@ use re_renderer::{
 };
 
 use crate::{
-    misc::{HoveredSpace, Item},
+    misc::{HoveredSpace, Item, SpaceViewHighlights},
     ui::{
         data_ui::{self, DataUi},
         view_spatial::{
             scene::AdditionalPickingInfo,
+            ui::create_labels,
             ui_renderer_bridge::{create_scene_paint_callback, get_viewport, ScreenBackground},
             SceneSpatial, SpaceCamera3D,
         },
@@ -252,6 +254,7 @@ pub fn view_3d(
     space: &EntityPath,
     space_view_id: SpaceViewId,
     mut scene: SceneSpatial,
+    highlights: &SpaceViewHighlights,
 ) {
     crate::profile_function!();
 
@@ -295,7 +298,18 @@ pub fn view_3d(
         }
     }
 
+    // Create labels now since their shapes participate are added to scene.ui for picking.
+    let label_shapes = create_labels(
+        &mut scene.ui,
+        RectTransform::from_to(rect, rect),
+        RectTransform::from_to(rect, rect),
+        &eye,
+        ui,
+        highlights,
+    );
+
     // TODO(andreas): We're very close making the hover reaction of ui2d and ui3d the same. Finish the job!
+    // Check if we're hovering any hover primitive.
     if let Some(pointer_pos) = response.hover_pos() {
         let picking_result =
             scene.picking(glam::vec2(pointer_pos.x, pointer_pos.y), &rect, &eye, 5.0);
@@ -478,6 +492,10 @@ pub fn view_3d(
         &space.to_string(),
         state.auto_size_config(rect.size()),
     );
+
+    // Add egui driven labels on top of re_renderer content.
+    let painter = ui.painter().with_clip_rect(ui.max_rect());
+    painter.extend(label_shapes);
 }
 
 fn paint_view(
@@ -521,45 +539,6 @@ fn paint_view(
         return;
     };
     ui.painter().add(callback);
-
-    // Draw labels:
-    {
-        let painter = ui.painter().with_clip_rect(ui.max_rect());
-
-        crate::profile_function!("labels");
-        let ui_from_world = eye.ui_from_world(&rect);
-        for label in &scene.ui.labels_3d {
-            let pos_in_ui = ui_from_world * label.origin.extend(1.0);
-            if pos_in_ui.w <= 0.0 {
-                continue; // behind camera
-            }
-            let pos_in_ui = pos_in_ui / pos_in_ui.w;
-
-            let font_id = egui::TextStyle::Monospace.resolve(ui.style());
-
-            let galley = ui.fonts(|fonts| {
-                fonts.layout(
-                    (*label.text).to_owned(),
-                    font_id,
-                    ui.style().visuals.text_color(),
-                    100.0,
-                )
-            });
-
-            let text_rect = egui::Align2::CENTER_TOP.anchor_rect(egui::Rect::from_min_size(
-                egui::pos2(pos_in_ui.x, pos_in_ui.y),
-                galley.size(),
-            ));
-
-            let bg_rect = text_rect.expand2(egui::vec2(6.0, 2.0));
-            painter.add(egui::Shape::rect_filled(
-                bg_rect,
-                3.0,
-                ui.style().visuals.code_bg_color,
-            ));
-            painter.add(egui::Shape::galley(text_rect.min, galley));
-        }
-    }
 }
 
 fn show_projections_from_2d_space(