Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-10 07:55:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #26458 - Manishearth:secondary-view, r=asajeffrey

Browse source 
Update webxr with secondary view support

Blocked on https://github.com/servo/webxr/pull/171 , untested
This commit is contained in:
bors-servo 2020-05-12 21:39:50 -04:00 • committed by GitHub
commit bdfa6b0751
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Cargo.lock generated
View file

@ -3841,7 +3841,7 @@ dependencies = [
[[package]] [[package]]
name = "openxr" name = "openxr"
version = "0.12.1" version = "0.12.1"
source = "git+https://github.com/servo/openxrs.git?branch=xr-msft#676c1f267a607bd8d2a3b984c49625b825c873d0" source = "git+https://github.com/servo/openxrs.git?branch=xr-msft#fd761bf95d62c26709f8589bd82b495cd8276c8f"
dependencies = [ dependencies = [
"libc", "libc",
"libloading 0.6.1", "libloading 0.6.1",
@ -3852,7 +3852,7 @@ dependencies = [
[[package]] [[package]]
name = "openxr-sys" name = "openxr-sys"
version = "0.8.1" version = "0.8.1"
source = "git+https://github.com/servo/openxrs.git?branch=xr-msft#676c1f267a607bd8d2a3b984c49625b825c873d0" source = "git+https://github.com/servo/openxrs.git?branch=xr-msft#fd761bf95d62c26709f8589bd82b495cd8276c8f"
dependencies = [ dependencies = [
"libc", "libc",
"winapi", "winapi",
@ -6471,7 +6471,7 @@ dependencies = [
[[package]] [[package]]
name = "webxr" name = "webxr"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/webxr#e30ebd848c4deb95833c2fea91d7d8d34f6d8ed8" source = "git+https://github.com/servo/webxr#51477cb33fdb3bf3d5cc8b5af9e547fad9d67319"
dependencies = [ dependencies = [
"android_injected_glue", "android_injected_glue",
"bindgen", "bindgen",
@ -6494,7 +6494,7 @@ dependencies = [
[[package]] [[package]]
name = "webxr-api" name = "webxr-api"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/webxr#e30ebd848c4deb95833c2fea91d7d8d34f6d8ed8" source = "git+https://github.com/servo/webxr#51477cb33fdb3bf3d5cc8b5af9e547fad9d67319"
dependencies = [ dependencies = [
"euclid", "euclid",
"ipc-channel", "ipc-channel",

5
components/script/dom/xrviewerpose.rs
View file

@ -57,6 +57,11 @@ impl XRViewerPose {
views.push(XRView::new(global, session, &left, XREye::Left, &pose)); views.push(XRView::new(global, session, &left, XREye::Left, &pose));
views.push(XRView::new(global, session, &right, XREye::Right, &pose)); views.push(XRView::new(global, session, &right, XREye::Right, &pose));
}, },
Views::StereoCapture(left, right, third_eye) => {
views.push(XRView::new(global, session, &left, XREye::Left, &pose));
views.push(XRView::new(global, session, &right, XREye::Right, &pose));
views.push(XRView::new(global, session, &third_eye, XREye::None, &pose));
},
}); });
let transform = XRRigidTransform::new(global, cast_transform(pose)); let transform = XRRigidTransform::new(global, cast_transform(pose));
let pose = reflect_dom_object(Box::new(XRViewerPose::new_inherited(&transform)), global); let pose = reflect_dom_object(Box::new(XRViewerPose::new_inherited(&transform)), global);

3
components/script/dom/xrwebgllayer.rs
View file

@ -249,8 +249,11 @@ impl XRWebGLLayerMethods for XRWebGLLayer {
Rect::new(origin, self.size().cast()) Rect::new(origin, self.size().cast())
}, },
(XREye::None, Views::Mono(view)) => view.viewport, (XREye::None, Views::Mono(view)) => view.viewport,
(XREye::None, Views::StereoCapture(_, _, view)) => view.viewport,
(XREye::Left, Views::Stereo(view, _)) => view.viewport, (XREye::Left, Views::Stereo(view, _)) => view.viewport,
(XREye::Left, Views::StereoCapture(view, _, _)) => view.viewport,
(XREye::Right, Views::Stereo(_, view)) => view.viewport, (XREye::Right, Views::Stereo(_, view)) => view.viewport,
(XREye::Right, Views::StereoCapture(_, view, _)) => view.viewport,
_ => return None, _ => return None,
}; };