Upgrade integrations.

This change upgrades all integrations to their latest versions at time of writing.
olson-sean-k · Nov 23, 2024 · 19b6252 · 19b6252
1 parent 9e3bd9b
commit 19b6252
Show file tree

Hide file tree

Showing 3 changed files with 117 additions and 135 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -47,23 +47,23 @@ typenum = "^1.17.0"
 # Integrations.
 
 [dependencies.cgmath]
-version = "^0.17.0"
+version = "^0.18.0"
 optional = true
 
 [dependencies.glam]
-version = "^0.9.0"
+version = "^0.29.0"
 optional = true
 
 [dependencies.mint]
 version = "^0.5.0"
 optional = true
 
 [dependencies.nalgebra]
-version = "^0.22.0"
+version = "^0.33.0"
 optional = true
 
 [dependencies.ultraviolet]
-version = "^0.6.0"
+version = "^0.9.0"
 optional = true
 
 # Platform-specific features.
@@ -78,4 +78,4 @@ features = ["intel-mkl-static"]
 optional = true
 
 [dev-dependencies]
-nalgebra = "^0.22.0"
+nalgebra = "^0.33.0"
diff --git a/src/integration/glam.rs b/src/integration/glam.rs
@@ -93,11 +93,7 @@ impl Basis for Vec2 {
     }
 
     fn canonical_basis_component(index: usize) -> Option<Self> {
-        match index {
-            0 => Some(Self::unit_x()),
-            1 => Some(Self::unit_y()),
-            _ => None,
-        }
+        Self::AXES.get(index).copied()
     }
 }
 
@@ -113,12 +109,7 @@ impl Basis for Vec3 {
     }
 
     fn canonical_basis_component(index: usize) -> Option<Self> {
-        match index {
-            0 => Some(Self::unit_x()),
-            1 => Some(Self::unit_y()),
-            2 => Some(Self::unit_z()),
-            _ => None,
-        }
+        Self::AXES.get(index).copied()
     }
 }
 
@@ -134,12 +125,7 @@ impl Basis for Vec3A {
     }
 
     fn canonical_basis_component(index: usize) -> Option<Self> {
-        match index {
-            0 => Some(Self::unit_x()),
-            1 => Some(Self::unit_y()),
-            2 => Some(Self::unit_z()),
-            _ => None,
-        }
+        Self::AXES.get(index).copied()
     }
 }
 
@@ -156,13 +142,7 @@ impl Basis for Vec4 {
     }
 
     fn canonical_basis_component(index: usize) -> Option<Self> {
-        match index {
-            0 => Some(Self::unit_x()),
-            1 => Some(Self::unit_y()),
-            2 => Some(Self::unit_z()),
-            3 => Some(Self::unit_w()),
-            _ => None,
-        }
+        Self::AXES.get(index).copied()
     }
 }
 
@@ -488,14 +468,14 @@ impl Truncate<Vec2> for Vec3A {
 impl Truncate<Vec3> for Vec4 {
     fn truncate(self) -> (Vec3, Self::Item) {
         let z = self.z();
-        (self.truncate().into(), z)
+        (self.truncate(), z)
     }
 }
 
 impl Truncate<Vec3A> for Vec4 {
     fn truncate(self) -> (Vec3A, Self::Item) {
         let z = self.z();
-        (self.truncate(), z)
+        (self.truncate().into(), z)
     }
 }
 
@@ -515,7 +495,7 @@ impl VectorSpace for Vec2 {
     }
 
     fn zero() -> Self {
-        Self::zero()
+        Self::ZERO
     }
 }
 
@@ -536,7 +516,7 @@ impl VectorSpace for Vec3 {
     }
 
     fn zero() -> Self {
-        Self::zero()
+        Self::ZERO
     }
 }
 
@@ -557,25 +537,26 @@ impl VectorSpace for Vec3A {
     }
 
     fn zero() -> Self {
-        Self::zero()
+        Self::ZERO
     }
 }
 
 impl VectorSpace for Vec4 {
     type Scalar = f32;
 
     fn scalar_component(&self, index: usize) -> Option<Self::Scalar> {
+        let [x, y, z, w] = self.to_array();
         match index {
-            0 => Some(self.x()),
-            1 => Some(self.y()),
-            2 => Some(self.z()),
-            3 => Some(self.w()),
+            0 => Some(x),
+            1 => Some(y),
+            2 => Some(z),
+            3 => Some(w),
             _ => None,
         }
     }
 
     fn zero() -> Self {
-        Self::zero()
+        Self::ZERO
     }
 }