Remove use of nalgebra-macros

.github/workflows/rust.yaml

@@ -19,4 +19,4 @@ jobs:
     - uses: actions/checkout@v3
     - run: rustup update stable && rustup default stable
     - run: cargo build --verbose
-    - run: cargo test --verbose
+    - run: cargo test --verbose --workspace

Cargo.toml

@@ -10,7 +10,7 @@ assert_approx_eq = "1.1.0"
 clap = { version = "4.5.1", default-features = false, features = ["std", "derive"] }
 geometry = { version = "1.0.0", path = "geometry" }
 image = { version = "0.24.9", default-features = false, features = ["png"] }
-nalgebra = { version = "0.32.4", default-features = false, features = ["macros", "std"] }
+nalgebra = { version = "0.32.4", default-features = false, features = ["std"] }
 rand = { version = "0.8.5", default-features = false, features = ["small_rng", "std"] }
 rayon = "1.9.0"
 simba = { version = "0.8.1", default-features = false }

geometry/Cargo.toml

@@ -4,5 +4,5 @@ version = "1.0.0"
 edition = "2021"
 
 [dependencies]
-nalgebra = { version = "0.32.4", default-features = false, features = ["macros", "std"] }
+nalgebra = { version = "0.32.4", default-features = false, features = ["std"] }
 smallvec = { version = "1.13.2", default-features = false }

geometry/src/aabb.rs

@@ -1,5 +1,4 @@
-use nalgebra;
-use nalgebra::{vector, Vector3};
+use nalgebra::Vector3;
 
 use super::aap::Aap;
 
@@ -28,8 +27,8 @@ impl Aabb {
 
     pub fn unit() -> Aabb {
         Aabb {
-            center: vector![0., 0., 0.],
-            half_size: vector![0.5, 0.5, 0.5],
+            center: Vector3::new(0., 0., 0.),
+            half_size: Vector3::new(0.5, 0.5, 0.5),
         }
     }
 
@@ -76,8 +75,16 @@ impl Aabb {
     pub fn split(&self, plane: &Aap) -> (Aabb, Aabb) {
         let fst_half_axis = (plane.distance - self.min()[plane.axis]) / 2.;
         let snd_half_axis = (self.max()[plane.axis] - plane.distance) / 2.;
-        debug_assert!(fst_half_axis >= 0.0, "fst_half_axis is negative {}", fst_half_axis);
-        debug_assert!(snd_half_axis >= 0.0, "snd_half_axis is negative {}", snd_half_axis);
+        debug_assert!(
+            fst_half_axis >= 0.0,
+            "fst_half_axis is negative {}",
+            fst_half_axis
+        );
+        debug_assert!(
+            snd_half_axis >= 0.0,
+            "snd_half_axis is negative {}",
+            snd_half_axis
+        );
 
         let mut fst_center = self.center;
         let mut fst_half_size = self.half_size;

geometry/src/aap.rs

@@ -1,4 +1,4 @@
-use nalgebra::{vector, Vector3};
+use nalgebra::Vector3;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum Axis {
@@ -19,9 +19,9 @@ impl Axis {
 
     pub fn as_vector3(&self, v: f32) -> Vector3<f32> {
         match self {
-            Axis::X => vector![v, 0.0, 0.0],
-            Axis::Y => vector![0.0, v, 0.0],
-            Axis::Z => vector![0.0, 0.0, v],
+            Axis::X => Vector3::new(v, 0.0, 0.0),
+            Axis::Y => Vector3::new(0.0, v, 0.0),
+            Axis::Z => Vector3::new(0.0, 0.0, v),
         }
     }
 }