fixup: plane offset handling

rerun-io · Nov 28, 2024 · 6b18472 · 6b18472
1 parent fd9e302
commit 6b18472
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/crates/viewer/re_renderer/src/renderer/world_grid.rs b/crates/viewer/re_renderer/src/renderer/world_grid.rs
@@ -28,9 +28,6 @@ pub struct WorldGridConfiguration {
 
     /// How thick the lines are in UI units.
     pub thickness_ui: f32,
-
-    /// Offset of the grid along its normal.
-    pub normal_offset: f32,
 }
 
 mod gpu_data {

diff --git a/crates/viewer/re_space_view_spatial/src/ui_3d.rs b/crates/viewer/re_space_view_spatial/src/ui_3d.rs
@@ -735,12 +735,12 @@ impl SpatialSpaceView3D {
             grid_config.component_or_fallback::<re_types::components::Color>(ctx, self, state)?;
         let orientation =
             grid_config.component_or_fallback::<PlaneOrientation>(ctx, self, state)?;
+        let normal_offset = **grid_config.component_or_fallback::<PlaneOffset>(ctx, self, state)?;
         let plane = match orientation {
-            PlaneOrientation::Xy => re_math::Plane3::XY,
-            PlaneOrientation::Yz => re_math::Plane3::YZ,
-            PlaneOrientation::Xz => re_math::Plane3::ZX,
+            PlaneOrientation::Xy => re_math::Plane3::from_normal_dist(glam::Vec3::Z, normal_offset),
+            PlaneOrientation::Yz => re_math::Plane3::from_normal_dist(glam::Vec3::X, normal_offset),
+            PlaneOrientation::Xz => re_math::Plane3::from_normal_dist(glam::Vec3::Y, normal_offset),
         };
-        let normal_offset = **grid_config.component_or_fallback::<PlaneOffset>(ctx, self, state)?;
 
         let Some(render_ctx) = ctx.render_ctx else {
             return Ok(None);
@@ -753,7 +753,6 @@ impl SpatialSpaceView3D {
                 plane,
                 spacing,
                 thickness_ui,
-                normal_offset,
             },
         )))
     }