types for hyperbolic space

client/src/graphics/draw.rs

@@ -289,7 +289,7 @@ impl Draw {
         let draw_started = Instant::now();
         let view = sim.as_ref().map_or_else(Position::origin, |sim| sim.view());
         let projection = frustum.projection(1.0e-4);
-        let view_projection = projection.matrix() * <math::MIsometry<_> as Into<na::Matrix4<_>>>::into(view.local.mtranspose());
+        let view_projection = projection.matrix() * na::Matrix4::<_>::from(view.local.mtranspose());
         self.loader.drive();
 
         let device = &*self.gfx.device;
@@ -482,8 +482,8 @@ impl Draw {
                         .expect("positionless entity in graph");
                     if let Some(character_model) = self.loader.get(self.character_model) {
                         if let Ok(ch) = sim.world.get::<&Character>(entity) {
-                            let transform = <math::MIsometry<_> as Into<na::Matrix4<_>>>::into(transform)
-                                * <math::MIsometry<_> as Into<na::Matrix4<_>>>::into(pos.local)
+                            let transform = na::Matrix4::<_>::from(transform)
+                                * na::Matrix4::<_>::from(pos.local)
                                 * na::Matrix4::new_scaling(sim.cfg().meters_to_absolute)
                                 * ch.state.orientation.to_homogeneous();
                             for mesh in &character_model.0 {

client/src/graphics/voxels/mod.rs

@@ -174,7 +174,7 @@ impl Voxels {
                             frame.drawn.push(slot);
                             // Transfer transform
                             frame.surface.transforms_mut()[slot.0 as usize] =
-                                <math::MIsometry<_> as Into<na::Matrix4<_>>>::into(*node_transform) * vertex.chunk_to_node();
+                                na::Matrix4::<_>::from(*node_transform) * vertex.chunk_to_node();
                         }
                         if let (None, &VoxelData::Dense(ref data)) = (&surface, voxels) {
                             // Extract a surface so it can be drawn in future frames

common/src/dodeca.rs

@@ -71,7 +71,7 @@ impl Side {
     #[inline]
     pub fn is_facing(self, p: &MVector<f32>) -> bool {
         let r = na::convert::<_, na::RowVector4<f32>>(self.reflection().row(3).clone_owned());
-        (r * <MVector<f32> as Into<na::Vector4<f32>>>::into(*p)).x < p.w
+        (r * na::Vector4::<_>::from(*p)).x < p.w
     }
 }
 
@@ -178,22 +178,22 @@ impl Vertex {
 
     /// Transform from euclidean chunk coordinates to hyperbolic node space
     pub fn chunk_to_node(self) -> na::Matrix4<f32> {
-        <MIsometry<f32> as Into<na::Matrix4<f32>>>::into(*self.dual_to_node()) * na::Matrix4::new_scaling(1.0 / Self::dual_to_chunk_factor())
+        na::Matrix4::<_>::from(*self.dual_to_node()) * na::Matrix4::new_scaling(1.0 / Self::dual_to_chunk_factor())
     }
 
     /// Transform from euclidean chunk coordinates to hyperbolic node space
     pub fn chunk_to_node_f64(self) -> na::Matrix4<f64> {
-        <MIsometry<f64> as Into<na::Matrix4<f64>>>::into(*self.dual_to_node_f64()) * na::Matrix4::new_scaling(1.0 / Self::dual_to_chunk_factor_f64())
+        na::Matrix4::<_>::from(*self.dual_to_node_f64()) * na::Matrix4::new_scaling(1.0 / Self::dual_to_chunk_factor_f64())
     }
 
     /// Transform from hyperbolic node space to euclidean chunk coordinates
     pub fn node_to_chunk(self) -> na::Matrix4<f32> {
-        na::Matrix4::new_scaling(Self::dual_to_chunk_factor()) * <MIsometry<f32> as Into<na::Matrix4<f32>>>::into(*self.node_to_dual())
+        na::Matrix4::new_scaling(Self::dual_to_chunk_factor()) * na::Matrix4::<_>::from(*self.node_to_dual())
     }
 
     /// Transform from hyperbolic node space to euclidean chunk coordinates
     pub fn node_to_chunk_f64(self) -> na::Matrix4<f64> {
-        na::Matrix4::new_scaling(Self::dual_to_chunk_factor_f64()) * <MIsometry<f64> as Into<na::Matrix4<f64>>>::into(*self.node_to_dual_f64())
+        na::Matrix4::new_scaling(Self::dual_to_chunk_factor_f64()) * na::Matrix4::<_>::from(*self.node_to_dual_f64())
     }
 
     /// Transform from cube-centric coordinates to dodeca-centric coordinates

common/src/math.rs

@@ -92,19 +92,19 @@ impl<N: Scalar> Deref for MIsometry<N> {
     }
 }
 
-impl<N: Scalar> Into<na::Matrix4<N>> for MIsometry<N>
+impl<N: Scalar> From<MIsometry<N>> for na::Matrix4<N>
 {
-    fn into(self) -> na::Matrix4<N>
+    fn from(value: MIsometry<N>) -> na::Matrix4<N>
     {
-        self.0
+        value.0
     }
 }
 
-impl<N: Scalar> Into<na::Vector4<N>> for MVector<N>
+impl<N: Scalar> From<MVector<N>> for na::Vector4<N>
 {
-    fn into(self) -> na::Vector4<N>
+    fn from(value: MVector<N>) -> na::Vector4<N>
     {
-        self.0
+        value.0
     }
 }