Update glam to 0.30, and replace re_math with macaw (#10119)

Author: emilk

Cargo.lock

@@ -3590,9 +3590,9 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.28.0"
+version = "0.30.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94"
+checksum = "6b46b9ca4690308844c644e7c634d68792467260e051c8543e0c7871662b3ba7"
 dependencies = [
  "bytemuck",
  "serde",
@@ -3878,12 +3878,13 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hexasphere"
-version = "14.1.0"
+version = "16.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "344d5bf5d6b6da1020fcfd4014d44e0cc695356c603db9c774b30bd6d385ad2b"
+checksum = "29a164ceff4500f2a72b1d21beaa8aa8ad83aec2b641844c659b190cb3ea2e0b"
 dependencies = [
  "constgebra",
  "glam",
+ "tinyvec",
 ]
 
 [[package]]
@@ -4843,6 +4844,17 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "macaw"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c96b82556b0d4aa25cd4771b64ef9bde7c120afb588a083fcb242bf01e4a09b"
+dependencies = [
+ "glam",
+ "num-traits",
+ "serde",
+]
+
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
@@ -7211,16 +7223,6 @@ dependencies = [
  "web-time",
 ]
 
-[[package]]
-name = "re_math"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "999db5029a2879efeddb538f2e486aabf33adf7a0b3708c6df5c1cae13b3af49"
-dependencies = [
- "glam",
- "serde",
-]
-
 [[package]]
 name = "re_memory"
 version = "0.24.0-alpha.1+dev"
@@ -7393,6 +7395,7 @@ dependencies = [
  "half",
  "itertools 0.14.0",
  "js-sys",
+ "macaw",
  "never",
  "notify",
  "ordered-float 4.4.0",
@@ -7403,7 +7406,6 @@ dependencies = [
  "re_build_tools",
  "re_error",
  "re_log",
- "re_math",
  "re_tracing",
  "re_video",
  "serde",
@@ -7434,10 +7436,10 @@ dependencies = [
  "glam",
  "image",
  "itertools 0.14.0",
+ "macaw",
  "pollster 0.4.0",
  "rand",
  "re_log",
- "re_math",
  "re_renderer",
  "wasm-bindgen-futures",
  "web-sys",
@@ -7627,6 +7629,7 @@ dependencies = [
  "infer",
  "itertools 0.14.0",
  "linked-hash-map",
+ "macaw",
  "mime_guess2",
  "mint",
  "ndarray",
@@ -7640,7 +7643,6 @@ dependencies = [
  "re_format",
  "re_log",
  "re_log_types",
- "re_math",
  "re_tracing",
  "re_types_builder",
  "re_types_core",
@@ -7888,11 +7890,11 @@ dependencies = [
  "egui",
  "glam",
  "itertools 0.14.0",
+ "macaw",
  "re_data_ui",
  "re_entity_db",
  "re_log",
  "re_log_types",
- "re_math",
  "re_query",
  "re_renderer",
  "re_tracing",
@@ -7919,6 +7921,7 @@ dependencies = [
  "image",
  "insta",
  "itertools 0.14.0",
+ "macaw",
  "ndarray",
  "nohash-hasher",
  "once_cell",
@@ -7931,7 +7934,6 @@ dependencies = [
  "re_format",
  "re_log",
  "re_log_types",
- "re_math",
  "re_query",
  "re_renderer",
  "re_tracing",
@@ -8141,6 +8143,7 @@ dependencies = [
  "indexmap 2.8.0",
  "itertools 0.14.0",
  "linked-hash-map",
+ "macaw",
  "ndarray",
  "nohash-hasher",
  "once_cell",
@@ -8154,7 +8157,6 @@ dependencies = [
  "re_grpc_client",
  "re_log",
  "re_log_types",
- "re_math",
  "re_query",
  "re_renderer",
  "re_smart_channel",
@@ -9878,9 +9880,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
 dependencies = [
  "tinyvec_macros",
 ]

Cargo.toml

@@ -138,7 +138,7 @@ re_viewport_blueprint = { path = "crates/viewer/re_viewport_blueprint", version
 re_web_viewer_server = { path = "crates/viewer/re_web_viewer_server", version = "=0.24.0-alpha.1", default-features = false }
 
 # Rerun crates in other repos:
-re_math = "0.20.0"
+re_mp4 = "0.3.0"
 
 # If this package fails to build, install `nasm` locally, or build through `pixi`.
 # NOTE: we use `dav1d` as an alias for our own re_rav1d crate
@@ -221,11 +221,11 @@ flatbuffers = "24.12.23"
 futures = "0.3"
 futures-util = "0.3"
 getrandom = "0.2"
-glam = { version = "0.28", features = ["debug-glam-assert"] }
+glam = { version = "0.30.3", features = ["debug-glam-assert"] }
 glob = "0.3"
 gltf = "1.1"
 half = { version = "2.3.1", features = ["bytemuck"] }
-hexasphere = "14.1.0"
+hexasphere = "16.0.0"
 home = "=0.5.9"
 image = { version = "0.25", default-features = false }
 indent = "0.1"
@@ -242,11 +242,11 @@ linked-hash-map = { version = "0.5", default-features = false }
 log = "0.4"
 log-once = "0.4"
 lz4_flex = "0.11"
+macaw = "0.30.0"
 memory-stats = "1.1"
 mimalloc = "0.1.43"
 mime_guess2 = "2.0" # infer MIME type by file extension, and map mime to file extension
 mint = "0.5.9"
-re_mp4 = "0.3.0"
 natord = "1.0.9"
 ndarray = "0.16"
 ndarray-rand = "0.15"

crates/store/re_types/Cargo.toml

@@ -33,8 +33,8 @@ ecolor = ["dep:ecolor"]
 ## Enable conversions to plot primitives
 egui_plot = ["dep:egui_plot"]
 
-## Add support for some math operations using [`glam`](https://crates.io/crates/glam/) and [`re_math`](https://crates.io/crates/re_math/).
-glam = ["dep:glam", "dep:re_math"]
+## Add support for some math operations using [`glam`](https://crates.io/crates/glam/) and [`macaw`](https://crates.io/crates/macaw/).
+glam = ["dep:glam", "dep:macaw"]
 
 ## Integration with the [`image`](https://crates.io/crates/image/) crate, plus JPEG and TIFF support.
 image = ["dep:ecolor", "dep:image", "dep:tiff"]
@@ -90,7 +90,7 @@ image = { workspace = true, optional = true, default-features = false, features
   "jpeg",
 ] }
 mint = { workspace = true, optional = true }
-re_math = { workspace = true, optional = true }
+macaw = { workspace = true, optional = true }
 serde = { workspace = true, optional = true, features = ["derive", "rc"] }
 
 

crates/store/re_types/src/components/plane3d_ext.rs

@@ -20,7 +20,7 @@ impl Plane3D {
 }
 
 #[cfg(feature = "glam")]
-impl From<Plane3D> for re_math::Plane3 {
+impl From<Plane3D> for macaw::Plane3 {
     #[inline]
     fn from(plane: Plane3D) -> Self {
         Self {

crates/store/re_types/src/datatypes/plane3d_ext.rs

@@ -33,15 +33,15 @@ impl Plane3D {
 }
 
 #[cfg(feature = "glam")]
-impl From<re_math::Plane3> for Plane3D {
+impl From<macaw::Plane3> for Plane3D {
     #[inline]
-    fn from(plane: re_math::Plane3) -> Self {
+    fn from(plane: macaw::Plane3) -> Self {
         Self([plane.normal.x, plane.normal.y, plane.normal.z, plane.d])
     }
 }
 
 #[cfg(feature = "glam")]
-impl From<Plane3D> for re_math::Plane3 {
+impl From<Plane3D> for macaw::Plane3 {
     #[inline]
     fn from(plane: Plane3D) -> Self {
         Self {

crates/viewer/re_renderer/Cargo.toml

@@ -53,7 +53,7 @@ serde = ["dep:serde"]
 [dependencies]
 re_error.workspace = true
 re_log.workspace = true
-re_math.workspace = true
+macaw.workspace = true
 re_tracing.workspace = true
 re_video = { workspace = true, default-features = true }
 

crates/viewer/re_renderer/src/importer/cpu_model.rs

@@ -52,8 +52,8 @@ impl CpuModel {
         });
     }
 
-    pub fn calculate_bounding_box(&self) -> re_math::BoundingBox {
-        re_math::BoundingBox::from_points(
+    pub fn calculate_bounding_box(&self) -> macaw::BoundingBox {
+        macaw::BoundingBox::from_points(
             self.instances
                 .iter()
                 .filter_map(|mesh_instance| {

crates/viewer/re_renderer/src/line_drawable_builder.rs

@@ -332,7 +332,7 @@ impl<'ctx> LineBatchBuilder<'_, 'ctx> {
     /// Returns None for empty and non-finite boxes.
     pub fn add_box_outline(
         &mut self,
-        bbox: &re_math::BoundingBox,
+        bbox: &macaw::BoundingBox,
     ) -> Option<LineStripBuilder<'_, 'ctx>> {
         if !bbox.is_something() || !bbox.is_finite() {
             return None;

crates/viewer/re_renderer/src/renderer/depth_cloud.rs

@@ -171,7 +171,7 @@ impl DepthCloud {
     ///
     /// Assumes max extent to be the maximum depth used for colormapping
     /// but ignores the minimum depth, using the frustum's origin instead.
-    pub fn world_space_bbox(&self) -> re_math::BoundingBox {
+    pub fn world_space_bbox(&self) -> macaw::BoundingBox {
         let max_depth = self.min_max_depth_in_world[1];
         let w = self.depth_dimensions.x as f32;
         let h = self.depth_dimensions.y as f32;
@@ -187,7 +187,7 @@ impl DepthCloud {
         let focal_length = glam::vec2(intrinsics.col(0).x, intrinsics.col(1).y);
         let offset = intrinsics.col(2).truncate();
 
-        let mut bbox = re_math::BoundingBox::NOTHING;
+        let mut bbox = macaw::BoundingBox::nothing();
 
         for corner in corners {
             let depth = corner.z;

crates/viewer/re_renderer/src/renderer/world_grid.rs

@@ -21,7 +21,7 @@ pub struct WorldGridConfiguration {
     pub color: Rgba,
 
     /// The plane in which the grid lines are drawn.
-    pub plane: re_math::Plane3,
+    pub plane: macaw::Plane3,
 
     /// How far apart the closest sets of lines are.
     pub spacing: f32,

crates/viewer/re_renderer/src/view_builder.rs

@@ -195,7 +195,7 @@ pub struct TargetConfiguration {
 
     /// The viewport resolution in physical pixels.
     pub resolution_in_pixel: [u32; 2],
-    pub view_from_world: re_math::IsoTransform,
+    pub view_from_world: macaw::IsoTransform,
     pub projection_from_view: Projection,
 
     /// Defines a viewport transformation from the projected space to the final image space.

crates/viewer/re_renderer_examples/2d.rs

@@ -295,7 +295,7 @@ impl framework::Example for Render2D {
                     TargetConfiguration {
                         name: "2D".into(),
                         resolution_in_pixel: splits[0].resolution_in_pixel,
-                        view_from_world: re_math::IsoTransform::IDENTITY,
+                        view_from_world: macaw::IsoTransform::IDENTITY,
                         projection_from_view: Projection::Orthographic {
                             camera_mode:
                                 view_builder::OrthographicCameraMode::TopLeftCornerAndExtendZ,
@@ -331,7 +331,7 @@ impl framework::Example for Render2D {
                     view_builder::TargetConfiguration {
                         name: "3D".into(),
                         resolution_in_pixel: splits[1].resolution_in_pixel,
-                        view_from_world: re_math::IsoTransform::look_at_rh(
+                        view_from_world: macaw::IsoTransform::look_at_rh(
                             camera_position,
                             camera_rotation_center,
                             glam::Vec3::Y,

crates/viewer/re_renderer_examples/Cargo.toml

@@ -42,7 +42,7 @@ path = "world_grid.rs"
 
 [dependencies]
 re_log = { workspace = true, features = ["setup"] }
-re_math.workspace = true
+macaw.workspace = true
 re_renderer = { workspace = true, features = ["import-obj", "import-gltf"] }
 
 ahash.workspace = true

crates/viewer/re_renderer_examples/depth_cloud.rs

@@ -17,7 +17,7 @@ use std::f32::consts::TAU;
 
 use glam::Vec3;
 use itertools::Itertools as _;
-use re_math::IsoTransform;
+use macaw::IsoTransform;
 use re_renderer::{
     Color32, LineDrawableBuilder, PointCloudBuilder, Rgba, Size,
     renderer::{

crates/viewer/re_renderer_examples/depth_offset.rs

@@ -99,7 +99,7 @@ impl framework::Example for Render2D {
             view_builder::TargetConfiguration {
                 name: "3D".into(),
                 resolution_in_pixel: resolution,
-                view_from_world: re_math::IsoTransform::look_at_rh(
+                view_from_world: macaw::IsoTransform::look_at_rh(
                     glam::Vec3::Z * 2.0 * self.distance_scale,
                     glam::Vec3::ZERO,
                     glam::Vec3::Y,

crates/viewer/re_renderer_examples/multiview.rs

@@ -5,8 +5,8 @@ use std::f32::consts::TAU;
 use framework::Example;
 use glam::Vec3;
 use itertools::Itertools as _;
+use macaw::IsoTransform;
 use rand::Rng as _;
-use re_math::IsoTransform;
 
 use re_renderer::{
     Color32, GpuReadbackIdentifier, Hsva, LineDrawableBuilder, PointCloudBuilder, RenderContext,

crates/viewer/re_renderer_examples/outlines.rs

@@ -55,7 +55,7 @@ impl framework::Example for Outlines {
             TargetConfiguration {
                 name: "OutlinesDemo".into(),
                 resolution_in_pixel: resolution,
-                view_from_world: re_math::IsoTransform::look_at_rh(
+                view_from_world: macaw::IsoTransform::look_at_rh(
                     camera_position,
                     glam::Vec3::ZERO,
                     glam::Vec3::Y,

crates/viewer/re_renderer_examples/picking.rs

@@ -126,7 +126,7 @@ impl framework::Example for Picking {
             TargetConfiguration {
                 name: "OutlinesDemo".into(),
                 resolution_in_pixel: resolution,
-                view_from_world: re_math::IsoTransform::look_at_rh(
+                view_from_world: macaw::IsoTransform::look_at_rh(
                     camera_position,
                     glam::Vec3::ZERO,
                     glam::Vec3::Y,