clean up

Author: IsseW

crates/viewer/re_time_panel/src/time_panel.rs

@@ -167,6 +167,8 @@ impl Default for TimePanel {
     }
 }
 
+/// This trait is used for the time panel to interact with either a
+/// `TimeControl` or a `BlueprintTimeControl` to avoid code duplication.
 pub trait TimeControlExt: Clone + PartialEq {
     fn get(&self) -> &TimeControl;
     fn get_mut(&mut self) -> &mut TimeControl;

crates/viewer/re_view_spatial/tests/video.rs

@@ -1,7 +1,5 @@
 #![expect(clippy::unwrap_used)] // It's a test!
 
-use std::cell::Cell;
-
 use re_chunk_store::RowId;
 use re_log_types::{NonMinI64, TimePoint};
 use re_test_context::{TestContext, external::egui_kittest::SnapshotOptions};
@@ -273,10 +271,6 @@ fn test_video(video_type: VideoType, codec: VideoCodec) {
     let step_dt_seconds = 1.0 / 4.0; // This is also the current egui_kittest default, but let's be explicit since we use `try_run_realtime`.
     let max_total_time_seconds = 60.0;
 
-    // Using a single harness for all frames - we want to make sure that we use the same decoder,
-    // not tearing down the video player!
-    let desired_seek_ns = Cell::new(0);
-
     let mut harness = test_context
         .setup_kittest_for_rendering()
         .with_step_dt(step_dt_seconds)
@@ -285,17 +279,16 @@ fn test_video(video_type: VideoType, codec: VideoCodec) {
         .build_ui(|ui| {
             test_context.run_with_single_view(ui, view_id);
 
-            test_context.with_blueprint_ctx(|ctx| {
-                ctx.set_time(NonMinI64::new(desired_seek_ns.get()).unwrap());
-            });
-
             std::thread::sleep(std::time::Duration::from_millis(20));
         });
 
     for seek_location in VideoTestSeekLocation::ALL {
-        desired_seek_ns.set(seek_location.get_time_ns(&frame_timestamps_nanos));
-
-        // Since we can't access `test_context` after creating `harness`, we have to do the seeking in here.
+        // Using a single harness for all frames - we want to make sure that we use the same decoder,
+        // not tearing down the video player!
+        let desired_seek_ns = seek_location.get_time_ns(&frame_timestamps_nanos);
+        test_context.with_blueprint_ctx(|ctx| {
+            ctx.set_time(NonMinI64::new(desired_seek_ns).unwrap());
+        });
 
         // Video decoding happens in a different thread, so it's important that we give it time
         // and don't busy loop.

crates/viewer/re_viewer_context/src/time_control.rs

@@ -363,6 +363,10 @@ impl TimeControl {
         )
     }
 
+    /// Sets the current time.
+    ///
+    /// If `blueprint_ctx` is some, this will also update the time stored in
+    /// the blueprint if `time_int` has changed.
     fn update_time(&mut self, blueprint_ctx: Option<&impl BlueprintContext>, time: TimeReal) {
         let time_int = time.floor();
         if self.time_int() != Some(time_int)
@@ -374,6 +378,10 @@ impl TimeControl {
         self.set_time(time);
     }
 
+    /// Read from the time panel blueprint and update the state from that.
+    ///
+    /// If `times_per_timeline` is some this will also make sure we are on
+    /// a valid timeline.
     fn update_from_blueprint(
         &mut self,
         blueprint_ctx: &impl BlueprintContext,
@@ -404,6 +412,10 @@ impl TimeControl {
         }
     }
 
+    /// See [`Self::update`].
+    ///
+    /// If `blueprint_ctx` is some, this will read and write to the
+    /// time panel blueprint.
     #[must_use]
     fn update_inner(
         &mut self,