Merge remote-tracking branch 'origin/main' into andreas/improved-entity-system-queries

Author: Wumpf

.github/pull_request_template.md

@@ -18,7 +18,7 @@ To get an auto-generated PR description you can put "copilot:summary" or "copilo
 * [ ] I have tested [demo.rerun.io](https://demo.rerun.io/pr/{{ pr.number }}) (if applicable)
 
 - [PR Build Summary](https://build.rerun.io/pr/{{ pr.number }})
-- [Docs preview](https://rerun.io/preview/{{ "pr:%s"|format(pr.branch)|encode_uri_component }}/docs)
-- [Examples preview](https://rerun.io/preview/{{ "pr:%s"|format(pr.branch)|encode_uri_component }}/examples)
+- [Docs preview](https://rerun.io/preview/{{ pr.commit }}/docs) <!--DOCS-PREVIEW-->
+- [Examples preview](https://rerun.io/preview/{{ pr.commit }}/examples) <!--EXAMPLES-PREVIEW-->
 - [Recent benchmark results](https://ref.rerun.io/dev/bench/)
 - [Wasm size tracking](https://ref.rerun.io/dev/sizes/)

.github/workflows/reusable_track_size.yml

@@ -78,12 +78,12 @@ jobs:
         run: |
           entries=()
 
-          entries+=("Wasm:web_viewer/re_viewer_bg.wasm:MB")
-          entries+=("JS:web_viewer/re_viewer.js:KB")
+          entries+=("Wasm:web_viewer/re_viewer_bg.wasm:MiB")
+          entries+=("JS:web_viewer/re_viewer.js:kiB")
 
           for file in web_demo/examples/**/*.rrd; do
             name=$(basename $(dirname "$file"))
-            entries+=("$name.rrd:$file:KB")
+            entries+=("$name.rrd:$file:MiB")
           done
 
           data=$(python3 scripts/ci/sizes.py measure "${entries[@]}")

Cargo.lock

@@ -75,6 +75,8 @@ where
 
     #[inline]
     fn deref(&self) -> &Self::Target {
-        self.get()
+        match self {
+            EditableAutoValue::Auto(v) | EditableAutoValue::UserEdited(v) => v,
+        }
     }
 }

crates/re_data_store/src/editable_auto_value.rs

@@ -49,7 +49,7 @@ where
     ///
     /// Do *not* make this public as we need to guarantee that the memory is *never* read from!
     #[inline(always)]
-    fn as_slice(&mut self) -> &mut [u8] {
+    fn as_mut_byte_slice(&mut self) -> &mut [u8] {
         // TODO(andreas): Is this access slow given that it internally goes through a trait interface? Should we keep the pointer around?
         &mut self.write_view[self.unwritten_element_range.start * std::mem::size_of::<T>()
             ..self.unwritten_element_range.end * std::mem::size_of::<T>()]
@@ -61,7 +61,7 @@ where
     #[inline]
     pub fn extend_from_slice(&mut self, elements: &[T]) {
         let bytes = bytemuck::cast_slice(elements);
-        self.as_slice()[..bytes.len()].copy_from_slice(bytes);
+        self.as_mut_byte_slice()[..bytes.len()].copy_from_slice(bytes);
         self.unwritten_element_range.start += elements.len();
     }
 
@@ -84,7 +84,15 @@ where
     /// Panics if the data no longer fits into the buffer.
     #[inline]
     pub fn push(&mut self, element: T) {
-        self.as_slice()[..std::mem::size_of::<T>()].copy_from_slice(bytemuck::bytes_of(&element));
+        assert!(
+            self.unwritten_element_range.start < self.unwritten_element_range.end,
+            "CpuWriteGpuReadBuffer<{}> is full ({} elements written)",
+            std::any::type_name::<T>(),
+            self.unwritten_element_range.start,
+        );
+
+        self.as_mut_byte_slice()[..std::mem::size_of::<T>()]
+            .copy_from_slice(bytemuck::bytes_of(&element));
         self.unwritten_element_range.start += 1;
     }
 

crates/re_renderer/src/allocator/cpu_write_gpu_read_belt.rs

@@ -192,7 +192,7 @@ impl TransformContext {
                 &child_tree.path,
                 data_store,
                 query,
-                |p| *entity_properties.get(p).pinhole_image_plane_distance.get(),
+                |p| *entity_properties.get(p).pinhole_image_plane_distance,
                 &mut encountered_pinhole,
             ) {
                 Err(unreachable_reason) => {

crates/re_space_view_spatial/src/contexts/transform_context.rs

@@ -232,7 +232,7 @@ fn update_transform3d_lines_heuristics(
                 // If there's a pinhole, we orient ourselves on its image plane distance
                 let pinhole_path_props = entity_properties.get(pinhole_path);
                 properties.transform_3d_size = EditableAutoValue::Auto(
-                    pinhole_path_props.pinhole_image_plane_distance.get() * 0.25,
+                    *pinhole_path_props.pinhole_image_plane_distance * 0.25,
                 );
             } else {
                 // Size should be proportional to the scene extent, here covered by its diagonal

crates/re_space_view_spatial/src/heuristics.rs

@@ -67,7 +67,7 @@ impl CamerasPart {
                 return;
             };
 
-        let frustum_length = *props.pinhole_image_plane_distance.get();
+        let frustum_length = *props.pinhole_image_plane_distance;
 
         // If the camera is our reference, there is nothing for us to display.
         if transforms.reference_path() == ent_path {

crates/re_space_view_spatial/src/parts/cameras.rs

@@ -225,7 +225,7 @@ impl ImagesPart {
                 }
             };
 
-            if *ent_props.backproject_depth.get() && tensor.meaning == TensorDataMeaning::Depth {
+            if *ent_props.backproject_depth && tensor.meaning == TensorDataMeaning::Depth {
                 if let Some(parent_pinhole_path) = transforms.parent_pinhole(ent_path) {
                     // NOTE: we don't pass in `world_from_obj` because this corresponds to the
                     // transform of the projection plane, which is of no use to us here.
@@ -342,11 +342,11 @@ impl ImagesPart {
             &tensor_stats,
         )?;
 
-        let depth_from_world_scale = *properties.depth_from_world_scale.get();
+        let depth_from_world_scale = *properties.depth_from_world_scale;
 
         let world_depth_from_texture_depth = 1.0 / depth_from_world_scale;
 
-        let colormap = match *properties.color_mapper.get() {
+        let colormap = match *properties.color_mapper {
             re_data_store::ColorMapper::Colormap(colormap) => match colormap {
                 re_data_store::Colormap::Grayscale => Colormap::Grayscale,
                 re_data_store::Colormap::Turbo => Colormap::Turbo,
@@ -362,7 +362,7 @@ impl ImagesPart {
         // at that distance.
         let fov_y = intrinsics.fov_y().unwrap_or(1.0);
         let pixel_width_from_depth = (0.5 * fov_y).tan() / (0.5 * height as f32);
-        let radius_scale = *properties.backproject_radius_scale.get();
+        let radius_scale = *properties.backproject_radius_scale;
         let point_radius_from_world_depth = radius_scale * pixel_width_from_depth;
 
         Ok(DepthCloud {

crates/re_space_view_spatial/src/parts/images.rs

@@ -55,7 +55,7 @@ impl ViewPartSystem for Transform3DArrowsPart {
                 continue;
             }
 
-            if !props.transform_3d_visible.get() {
+            if !*props.transform_3d_visible {
                 continue;
             }
 
@@ -76,7 +76,7 @@ impl ViewPartSystem for Transform3DArrowsPart {
                 &mut line_builder,
                 world_from_obj,
                 Some(ent_path),
-                *props.transform_3d_size.get(),
+                *props.transform_3d_size,
                 query
                     .highlights
                     .entity_outline_mask(ent_path.hash())