Auto merge of #201 - mrobinson:update-euclid, r=jdm

Update euclid to 0.22

None

Author: bors-servo

Cargo.toml

@@ -3,3 +3,6 @@ members = [
     "webxr",
     "webxr-api"
 ]
+
+[patch.crates-io]
+surfman-chains = { git = "https://github.com/servo/surfman-chains.git" }

webxr-api/Cargo.toml

@@ -23,7 +23,7 @@ ipc = ["serde", "ipc-channel", "euclid/serde"]
 profile = ["time"]
 
 [dependencies]
-euclid = "0.20"
+euclid = "0.22"
 ipc-channel = { version = "0.14", optional = true }
 log = "0.4"
 serde = { version = "1.0", optional = true }

webxr-api/util.rs

@@ -107,7 +107,7 @@ pub fn frustum_to_projection_matrix<T, U>(
     let h = top - bottom;
     let d = far - near;
 
-    Transform3D::column_major(
+    Transform3D::new(
         2. * near / w,
         0.,
         (right + left) / w,

webxr/Cargo.toml

@@ -37,14 +37,14 @@ profile = ["webxr-api/profile"]
 [dependencies]
 webxr-api = { path = "../webxr-api" }
 crossbeam-channel = "0.4"
-euclid = "0.20.10"
+euclid = "0.22"
 log = "0.4.6"
 gvr-sys = { version = "0.7", optional = true }
 openxr = { git = "https://github.com/servo/openxrs.git", branch="secondary-views-2", optional = true }
 serde = { version = "1.0", optional = true }
 sparkle = "0.1"
-surfman = "0.4"
-surfman-chains = "0.6"
+surfman = "0.5"
+surfman-chains = "0.7"
 time = "0.1.42"
 
 [target.'cfg(target_os = "windows")'.dependencies]

webxr/glwindow/mod.rs

@@ -234,7 +234,7 @@ impl DeviceAPI for GlWindowDevice {
             RigidTransform3D::from_translation(translation);
         let rotation = Rotation3D::from_untyped(&self.window.get_rotation());
         let rotation = RigidTransform3D::from_rotation(rotation);
-        let transform = translation.post_transform(&rotation);
+        let transform = translation.then(&rotation);
         let sub_images = self.layer_manager().ok()?.begin_frame(layers).ok()?;
         Some(Frame {
             pose: Some(ViewerPose {
@@ -606,7 +606,7 @@ impl GlWindowDevice {
         let transform: RigidTransform3D<f32, Viewer, Eye> =
             RigidTransform3D::new(rotation, translation);
         View {
-            transform: viewer.pre_transform(&transform.inverse()),
+            transform: transform.inverse().then(&viewer),
             projection,
         }
     }
@@ -630,7 +630,7 @@ impl GlWindowDevice {
         {
             #[rustfmt::skip]
             // Sigh, row-major vs column-major
-            return Transform3D::row_major(
+            return Transform3D::new(
                 f / aspect, 0.0, 0.0,                   0.0,
                 0.0,        f,   0.0,                   0.0,
                 0.0,        0.0, (far + near) * nf,     -1.0,

webxr/googlevr/device.rs

@@ -441,7 +441,7 @@ impl GoogleVRDevice {
         // only translation
         let transform: RigidTransform3D<f32, Viewer, Eye> = decompose_rigid(&eye_mat);
 
-        let transform = viewer.pre_transform(&transform.inverse());
+        let transform = transform.inverse().then(&viewer);
 
         View {
             projection,

webxr/headless/mod.rs

@@ -216,7 +216,7 @@ fn view<Eye>(
     };
 
     View {
-        transform: viewer.pre_transform(&init.transform.inverse()),
+        transform: init.transform.inverse().then(&viewer),
         projection,
     }
 }
@@ -560,11 +560,11 @@ impl HeadlessDeviceData {
                 .cast_unit(),
             BaseSpace::Joint(..) => panic!("Cannot request mocking backend with hands"),
         };
-        let space_origin = origin.pre_transform(&space.offset);
+        let space_origin = space.offset.then(&origin);
 
         let origin_rigid: RigidTransform3D<f32, ApiSpace, ApiSpace> = ray.origin.into();
         Some(Ray {
-            origin: origin_rigid.post_transform(&space_origin).translation,
+            origin: origin_rigid.then(&space_origin).translation,
             direction: space_origin.rotation.transform_vector3d(ray.direction),
         })
     }