UI tweaks

rerun-io · Nov 7, 2022 · 98b4190 · 98b4190
1 parent 39b1b1c
commit 98b4190
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/crates/re_viewer/src/ui/selection_panel.rs b/crates/re_viewer/src/ui/selection_panel.rs
@@ -202,12 +202,12 @@ fn ui_space_view(ctx: &mut ViewerContext<'_>, ui: &mut egui::Ui, space_view: &mu
 
     match space_view.selected_category {
         super::space_view::ViewCategory::ThreeD => {
-            ui.label("3D:");
+            ui.label("3D view.");
             super::view3d::show_settings_ui(ctx, ui, &mut space_view.view_state.state_3d);
         }
         super::space_view::ViewCategory::Tensor => {
             if let Some(state_tensor) = &mut space_view.view_state.state_tensor {
-                ui.label("Tensor:");
+                ui.label("Tensor view.");
                 state_tensor.ui(ui);
             }
         }

diff --git a/crates/re_viewer/src/ui/space_view.rs b/crates/re_viewer/src/ui/space_view.rs
@@ -87,7 +87,9 @@ impl SpaceView {
 
         match categories.len() {
             0 => {
-                ui.label("(empty)");
+                ui.centered_and_justified(|ui| {
+                    ui.label("(empty)");
+                });
             }
             1 => {
                 self.selected_category = categories[0];

diff --git a/crates/re_viewer/src/ui/view3d/mod.rs b/crates/re_viewer/src/ui/view3d/mod.rs
@@ -51,7 +51,9 @@ pub(crate) struct State3D {
 
     /// Filled in at the start of each frame
     #[serde(skip)]
-    pub space_specs: SpaceSpecs,
+    pub(crate) space_specs: SpaceSpecs,
+    #[serde(skip)]
+    space_camera: Vec<SpaceCamera>,
 }
 
 impl Default for State3D {
@@ -66,6 +68,7 @@ impl Default for State3D {
             show_axes: false,
             last_eye_interact_time: f64::NEG_INFINITY,
             space_specs: Default::default(),
+            space_camera: Default::default(),
         }
     }
 }
@@ -78,7 +81,7 @@ impl State3D {
         response: &egui::Response,
     ) -> &mut OrbitEye {
         if response.double_clicked() {
-            // Reset camera
+            // Reset eye
             if tracking_camera.is_some() {
                 ctx.rec_cfg.selection = Selection::None;
             }
@@ -225,7 +228,7 @@ pub(crate) fn show_settings_ui(
     }
 
     if ui
-        .button("Reset camera")
+        .button("Reset virtual camera")
         .on_hover_text("You can also double-click the 3D view")
         .clicked()
     {
@@ -234,13 +237,17 @@ pub(crate) fn show_settings_ui(
         // TODO(emilk): reset tracking camera too
     }
 
-    // TODO(emilk): only show if there is a camera om scene.
-    ui.toggle_value(&mut ctx.options.show_camera_mesh_in_3d, "Show camera mesh");
-
-    ui.toggle_value(&mut state.spin, "Spin Camera")
+    ui.checkbox(&mut state.spin, "Spin virtual camera")
         .on_hover_text("Spin view");
-    ui.toggle_value(&mut state.show_axes, "Show Axes")
+    ui.checkbox(&mut state.show_axes, "show origin axes")
         .on_hover_text("Show X-Y-Z axes");
+
+    if !state.space_camera.is_empty() {
+        ui.checkbox(
+            &mut ctx.options.show_camera_mesh_in_3d,
+            "Show camera meshes",
+        );
+    }
 }
 
 #[derive(Clone, Default)]
@@ -330,6 +337,7 @@ pub(crate) fn view_3d(
     crate::profile_function!();
 
     state.scene_bbox = state.scene_bbox.union(scene.calc_bbox());
+    state.space_camera = space_cameras.to_vec();
 
     let (rect, response) = ui.allocate_at_least(ui.available_size(), egui::Sense::click_and_drag());
 

diff --git a/crates/re_viewer/src/ui/view3d/space_camera.rs b/crates/re_viewer/src/ui/view3d/space_camera.rs
@@ -5,6 +5,7 @@ use re_data_store::ObjPath;
 use re_log_types::{IndexHash, ViewCoordinates};
 
 /// A logged camera that connects spaces.
+#[derive(Clone)]
 pub struct SpaceCamera {
     /// Path to the object which has the rigid [Self::world_from_camera`] transforms.
     pub camera_obj_path: ObjPath,