types for hyperbolic space

client/src/graphics/draw.rs

@@ -9,7 +9,7 @@ use metrics::histogram;
 use super::{fog, voxels, Base, Fog, Frustum, GltfScene, Meshes, Voxels};
 use crate::{Asset, Config, Loader, Sim};
 use common::proto::{Character, Position};
-use common::{math, SimConfig};
+use common::SimConfig;
 
 /// Manages rendering, independent of what is being rendered to
 pub struct Draw {
@@ -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::mtranspose(&view.local);
+        let view_projection = projection.matrix() * na::Matrix4::from(view.local.mtranspose());
         self.loader.drive();
 
         let device = &*self.gfx.device;
@@ -482,8 +482,7 @@ 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 = transform
-                                * pos.local
+                            let transform = na::Matrix4::from(transform * 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/frustum.rs

@@ -1,3 +1,4 @@
+use common::math::MVector;
 use common::Plane;
 
 #[derive(Debug, Copy, Clone)]
@@ -79,7 +80,7 @@ pub struct FrustumPlanes {
 }
 
 impl FrustumPlanes {
-    pub fn contain(&self, point: &na::Vector4<f32>, radius: f32) -> bool {
+    pub fn contain(&self, point: &MVector<f32>, radius: f32) -> bool {
         for &plane in &[&self.left, &self.right, &self.down, &self.up] {
             if plane.distance_to(point) < -radius {
                 return false;
@@ -92,20 +93,38 @@ impl FrustumPlanes {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use common::math::{origin, translate_along};
+    use common::math::translate_along;
     use std::f32;
 
     #[test]
     fn planes_sanity() {
         // 90 degree square
         let planes = Frustum::from_vfov(f32::consts::FRAC_PI_4, 1.0).planes();
-        assert!(planes.contain(&origin(), 0.1));
-        assert!(planes.contain(&(translate_along(&-na::Vector3::z()) * origin()), 0.0));
-        assert!(!planes.contain(&(translate_along(&na::Vector3::z()) * origin()), 0.0));
+        assert!(planes.contain(&MVector::origin(), 0.1));
+        assert!(planes.contain(
+            &(translate_along(&-na::Vector3::z()) * MVector::origin()),
+            0.0
+        ));
+        assert!(!planes.contain(
+            &(translate_along(&na::Vector3::z()) * MVector::origin()),
+            0.0
+        ));
 
-        assert!(!planes.contain(&(translate_along(&na::Vector3::x()) * origin()), 0.0));
-        assert!(!planes.contain(&(translate_along(&na::Vector3::y()) * origin()), 0.0));
-        assert!(!planes.contain(&(translate_along(&-na::Vector3::x()) * origin()), 0.0));
-        assert!(!planes.contain(&(translate_along(&-na::Vector3::y()) * origin()), 0.0));
+        assert!(!planes.contain(
+            &(translate_along(&na::Vector3::x()) * MVector::origin()),
+            0.0
+        ));
+        assert!(!planes.contain(
+            &(translate_along(&na::Vector3::y()) * MVector::origin()),
+            0.0
+        ));
+        assert!(!planes.contain(
+            &(translate_along(&-na::Vector3::x()) * MVector::origin()),
+            0.0
+        ));
+        assert!(!planes.contain(
+            &(translate_along(&-na::Vector3::y()) * MVector::origin()),
+            0.0
+        ));
     }
 }

client/src/graphics/voxels/mod.rs

@@ -20,7 +20,7 @@ use common::{
     dodeca::Vertex,
     graph::NodeId,
     lru_slab::SlotId,
-    math,
+    math::{MIsometry,MVector},
     node::{Chunk, ChunkId, VoxelData},
     LruSlab,
 };
@@ -88,7 +88,7 @@ impl Voxels {
         device: &Device,
         frame: &mut Frame,
         sim: &mut Sim,
-        nearby_nodes: &[(NodeId, na::Matrix4<f32>)],
+        nearby_nodes: &[(NodeId, MIsometry<f32>)],
         cmd: vk::CommandBuffer,
         frustum: &Frustum,
     ) {
@@ -122,12 +122,12 @@ impl Voxels {
         }
         let node_scan_started = Instant::now();
         let frustum_planes = frustum.planes();
-        let local_to_view = math::mtranspose(&view.local);
+        let local_to_view = view.local.mtranspose();
         let mut extractions = Vec::new();
         let mut workqueue_is_full = false;
         for &(node, ref node_transform) in nearby_nodes {
-            let node_to_view = local_to_view * node_transform;
-            let origin = node_to_view * math::origin();
+            let node_to_view = local_to_view * *node_transform;
+            let origin = node_to_view * MVector::origin();
             if !frustum_planes.contain(&origin, dodeca::BOUNDING_SPHERE_RADIUS) {
                 // Don't bother generating or drawing chunks from nodes that are wholly outside the
                 // frustum.
@@ -174,7 +174,7 @@ impl Voxels {
                             frame.drawn.push(slot);
                             // Transfer transform
                             frame.surface.transforms_mut()[slot.0 as usize] =
-                                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

client/src/local_character_controller.rs

@@ -1,4 +1,4 @@
-use common::{math, proto::Position};
+use common::{math, math::MIsometry, proto::Position};
 
 pub struct LocalCharacterController {
     /// The last extrapolated inter-frame view position, used for rendering and gravity-specific
@@ -25,7 +25,8 @@ impl LocalCharacterController {
     pub fn oriented_position(&self) -> Position {
         Position {
             node: self.position.node,
-            local: self.position.local * self.orientation.to_homogeneous(),
+            local: self.position.local
+                * MIsometry::unit_quaternion_to_homogeneous(self.orientation),
         }
     }
 

client/src/prediction.rs

@@ -101,12 +101,13 @@ impl PredictedMotion {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use common::math::MIsometry;
 
     /// An arbitrary position
     fn pos() -> Position {
         Position {
             node: common::graph::NodeId::ROOT,
-            local: na::one(),
+            local: MIsometry::identity(),
         }
     }
 

client/src/sim.rs

@@ -13,6 +13,8 @@ use common::{
     collision_math::Ray,
     graph::{Graph, NodeId},
     graph_ray_casting,
+    math,
+    math::{MVector,MIsometry},
     node::{populate_fresh_nodes, ChunkId, VoxelData},
     proto::{
         self, BlockUpdate, Character, CharacterInput, CharacterState, Command, Component,
@@ -109,7 +111,7 @@ impl Sim {
             selected_material: Material::WoodPlanks,
             prediction: PredictedMotion::new(proto::Position {
                 node: NodeId::ROOT,
-                local: na::one(),
+                local: MIsometry::identity(),
             }),
             local_character_controller: LocalCharacterController::new(),
         }
@@ -510,7 +512,7 @@ impl Sim {
     pub fn view(&self) -> Position {
         let mut pos = self.local_character_controller.oriented_position();
         let up = self.graph.get_relative_up(&pos).unwrap();
-        pos.local *= common::math::translate_along(
+        pos.local *= math::translate_along(
             &(up.as_ref() * (self.cfg.character.character_radius - 1e-3)),
         );
         pos
@@ -550,7 +552,7 @@ impl Sim {
         let ray_casing_result = graph_ray_casting::ray_cast(
             &self.graph,
             &view_position,
-            &Ray::new(na::Vector4::w(), -na::Vector4::z()),
+            &Ray::new(MVector::w(), -MVector::z()),
             self.cfg.character.block_reach,
         );
 

common/src/character_controller/collision.rs

@@ -2,7 +2,13 @@
 
 use tracing::error;
 
-use crate::{collision_math::Ray, graph::Graph, graph_collision, math, proto::Position};
+use crate::{
+    collision_math::Ray,
+    graph::Graph,
+    graph_collision, math,
+    math::{MIsometry, MVector},
+    proto::Position,
+};
 
 /// Checks for collisions when a character moves with a character-relative displacement vector of `relative_displacement`.
 pub fn check_collision(
@@ -22,7 +28,10 @@ pub fn check_collision(
     let displacement_norm = displacement_sqr.sqrt();
     let displacement_normalized = relative_displacement / displacement_norm;
 
-    let ray = Ray::new(math::origin(), displacement_normalized);
+    let ray = Ray::new(
+        MVector::origin(),
+        MVector::<f32>::from(displacement_normalized),
+    );
     let tanh_distance = displacement_norm.tanh();
 
     let cast_hit = graph_collision::sphere_cast(
@@ -58,7 +67,7 @@ pub fn check_collision(
             // This normal now represents a contact point at the origin, so we omit the w-coordinate
             // to ensure that it's orthogonal to the origin.
             normal: na::UnitVector3::new_normalize(
-                (math::mtranspose(&displacement_transform) * hit.normal).xyz(),
+                (displacement_transform.mtranspose() * hit.normal).xyz(),
             ),
         }),
     }
@@ -77,7 +86,7 @@ pub struct CollisionCheckingResult {
 
     /// Multiplying the character's position by this matrix will move the character as far as it can up to its intended
     /// displacement until it hits the wall.
-    pub displacement_transform: na::Matrix4<f32>,
+    pub displacement_transform: MIsometry<f32>,
 
     pub collision: Option<Collision>,
 }
@@ -88,7 +97,7 @@ impl CollisionCheckingResult {
     pub fn stationary() -> CollisionCheckingResult {
         CollisionCheckingResult {
             displacement_vector: na::Vector3::zeros(),
-            displacement_transform: na::Matrix4::identity(),
+            displacement_transform: MIsometry::identity(),
             collision: None,
         }
     }

common/src/character_controller/mod.rs

@@ -47,7 +47,7 @@ pub fn run_character_step(
     }
 
     // Renormalize
-    position.local = math::renormalize_isometry(&position.local);
+    position.local = position.local.renormalize_isometry();
     let (next_node, transition_xf) = graph.normalize_transform(position.node, &position.local);
     if next_node != position.node {
         position.node = next_node;