From e055884564f6bf1db0ea2ca6af3b3aaafd4fd17b Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Wed, 3 Apr 2019 13:31:34 -0700 Subject: [PATCH] Remove viewMatrix Users are supposed to use `view.transform.inverse.matrix` The view matrix was incorrect anyway, we had forgotten to invert it, but that was okay since we transposed it by accident (due to euclid's use of the row-vector convention), and for 3DOF devices these transforms are mostly rotations so transposing instead of inverting doesn't lead to visible effects. --- components/script/dom/webidls/XRView.webidl | 1 - components/script/dom/xrview.rs | 8 -------- 2 files changed, 9 deletions(-) diff --git a/components/script/dom/webidls/XRView.webidl b/components/script/dom/webidls/XRView.webidl index 73fcc123431..c56342c6469 100644 --- a/components/script/dom/webidls/XRView.webidl +++ b/components/script/dom/webidls/XRView.webidl @@ -13,6 +13,5 @@ enum XREye { interface XRView { readonly attribute XREye eye; readonly attribute Float32Array projectionMatrix; - readonly attribute Float32Array viewMatrix; readonly attribute XRRigidTransform transform; }; diff --git a/components/script/dom/xrview.rs b/components/script/dom/xrview.rs index 7862e583895..a2eee03581d 100644 --- a/components/script/dom/xrview.rs +++ b/components/script/dom/xrview.rs @@ -63,7 +63,6 @@ impl XRView { let offset = Vector3D::new(offset[0] as f64, offset[1] as f64, offset[2] as f64); let transform = pose.post_mul(&offset.into()); - let view = transform.to_transform().cast().to_column_major_array(); let transform = XRRigidTransform::new(global, transform); let ret = reflect_dom_object( @@ -75,7 +74,6 @@ impl XRView { let cx = global.get_cx(); unsafe { create_typed_array(cx, proj, &ret.proj); - create_typed_array(cx, &view, &ret.view); } ret } @@ -97,12 +95,6 @@ impl XRViewMethods for XRView { NonNull::new(self.proj.get()).unwrap() } - #[allow(unsafe_code)] - /// https://immersive-web.github.io/webxr/#dom-xrview-projectionmatrix - unsafe fn ViewMatrix(&self, _cx: *mut JSContext) -> NonNull { - NonNull::new(self.view.get()).unwrap() - } - /// https://immersive-web.github.io/webxr/#dom-xrview-transform fn Transform(&self) -> DomRoot { DomRoot::from_ref(&self.transform)