diff options
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/fakexrdevice.rs | 31 | ||||
| -rw-r--r-- | components/script/dom/webidls/FakeXRDevice.webidl | 8 | ||||
| -rw-r--r-- | components/script/dom/xrtest.rs | 16 |
3 files changed, 20 insertions, 35 deletions
diff --git a/components/script/dom/fakexrdevice.rs b/components/script/dom/fakexrdevice.rs index 885d05894ce..070ba5fa89c 100644 --- a/components/script/dom/fakexrdevice.rs +++ b/components/script/dom/fakexrdevice.rs @@ -54,16 +54,10 @@ pub fn get_views(views: &[FakeXRViewInit]) -> Fallible<(MockVRView, MockVRView)> _ => return Err(Error::NotSupported), }; - // can be removed once https://github.com/servo/servo/issues/23640 is fixed - let (position_l, position_r) = match (&left.viewOffset.position, &right.viewOffset.position) { - (&Some(ref l), &Some(ref r)) => (l, r), - _ => return Err(Error::Type("Must specify position".into())), - }; - if left.projectionMatrix.len() != 16 || right.projectionMatrix.len() != 16 || - position_l.len() != 3 || - position_r.len() != 3 + left.viewOffset.position.len() != 3 || + right.viewOffset.position.len() != 3 { return Err(Error::Type("Incorrectly sized array".into())); } @@ -77,9 +71,9 @@ pub fn get_views(views: &[FakeXRViewInit]) -> Fallible<(MockVRView, MockVRView)> let mut offset_l = [0.; 3]; let mut offset_r = [0.; 3]; - let v: Vec<_> = position_l.iter().map(|x| **x).collect(); + let v: Vec<_> = left.viewOffset.position.iter().map(|x| **x).collect(); offset_l.copy_from_slice(&v); - let v: Vec<_> = position_r.iter().map(|x| **x).collect(); + let v: Vec<_> = right.viewOffset.position.iter().map(|x| **x).collect(); offset_r.copy_from_slice(&v); let left = MockVRView { projection: proj_l, @@ -93,25 +87,14 @@ pub fn get_views(views: &[FakeXRViewInit]) -> Fallible<(MockVRView, MockVRView)> } pub fn get_origin(origin: &FakeXRRigidTransformInit) -> Fallible<([f32; 3], [f32; 4])> { - // can be removed once https://github.com/servo/servo/issues/23640 is fixed - let position = if let Some(ref position) = origin.position { - position - } else { - return Err(Error::Type("Missing position field".into())); - }; - let orientation = if let Some(ref orientation) = origin.orientation { - orientation - } else { - return Err(Error::Type("Missing orientation field".into())); - }; - if position.len() != 4 || orientation.len() != 4 { + if origin.position.len() != 3 || origin.orientation.len() != 4 { return Err(Error::Type("Incorrectly sized array".into())); } let mut p = [0.; 3]; let mut o = [0.; 4]; - let v: Vec<_> = position.iter().map(|x| **x).collect(); + let v: Vec<_> = origin.position.iter().map(|x| **x).collect(); p.copy_from_slice(&v[0..3]); - let v: Vec<_> = orientation.iter().map(|x| **x).collect(); + let v: Vec<_> = origin.orientation.iter().map(|x| **x).collect(); o.copy_from_slice(&v); Ok((p, o)) diff --git a/components/script/dom/webidls/FakeXRDevice.webidl b/components/script/dom/webidls/FakeXRDevice.webidl index d151ce12166..5e310c4d75f 100644 --- a/components/script/dom/webidls/FakeXRDevice.webidl +++ b/components/script/dom/webidls/FakeXRDevice.webidl @@ -14,8 +14,7 @@ interface FakeXRDevice { // Promise<void> disconnect(); // Sets the origin of the viewer - // dict must be optional because of https://github.com/servo/servo/issues/23640 - [Throws] void setViewerOrigin(optional FakeXRRigidTransformInit origin, optional boolean emulatedPosition = false); + [Throws] void setViewerOrigin(FakeXRRigidTransformInit origin, optional boolean emulatedPosition = false); // // Simulates devices focusing and blurring sessions. // void simulateVisibilityChange(XRVisibilityState); @@ -53,7 +52,6 @@ dictionary FakeXRBoundsPoint { }; dictionary FakeXRRigidTransformInit { - // should be required, see https://github.com/servo/servo/issues/23640 - sequence<float> position; - sequence<float> orientation; + required sequence<float> position; + required sequence<float> orientation; }; diff --git a/components/script/dom/xrtest.rs b/components/script/dom/xrtest.rs index 7f0b8a43ef9..6808ce262cd 100644 --- a/components/script/dom/xrtest.rs +++ b/components/script/dom/xrtest.rs @@ -52,12 +52,16 @@ impl XRTestMethods for XRTest { return p; } - let origin = match get_origin(&init.viewerOrigin) { - Ok(origin) => origin, - Err(e) => { - p.reject_error(e); - return p; - }, + let origin = if let Some(ref o) = init.viewerOrigin { + match get_origin(&o) { + Ok(origin) => origin, + Err(e) => { + p.reject_error(e); + return p; + }, + } + } else { + Default::default() }; let views = match get_views(&init.views) { |