From 28dff81dbf3f24ae470e1a0004f0813a3247e08f Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Fri, 21 Dec 2018 15:20:51 -0800 Subject: Fill in XR frame/pose/view implementations --- components/script/dom/xrframe.rs | 45 +++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) (limited to 'components/script/dom/xrframe.rs') diff --git a/components/script/dom/xrframe.rs b/components/script/dom/xrframe.rs index b7b8f7e0964..2430c1a3812 100644 --- a/components/script/dom/xrframe.rs +++ b/components/script/dom/xrframe.rs @@ -3,28 +3,63 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use crate::dom::bindings::codegen::Bindings::XRFrameBinding; -use crate::dom::bindings::reflector::{reflect_dom_object, Reflector}; -use crate::dom::bindings::root::DomRoot; +use crate::dom::bindings::codegen::Bindings::XRFrameBinding::XRFrameMethods; +use crate::dom::bindings::codegen::Bindings::XRViewBinding::XREye; +use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector}; +use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::globalscope::GlobalScope; +use crate::dom::xrreferencespace::XRReferenceSpace; +use crate::dom::xrsession::XRSession; +use crate::dom::xrview::XRView; +use crate::dom::xrviewerpose::XRViewerPose; use dom_struct::dom_struct; +use webvr_traits::WebVRFrameData; #[dom_struct] pub struct XRFrame { reflector_: Reflector, + session: Dom, + #[ignore_malloc_size_of = "defined in rust-webvr"] + data: WebVRFrameData, } impl XRFrame { - fn new_inherited() -> XRFrame { + fn new_inherited(session: &XRSession, data: WebVRFrameData) -> XRFrame { XRFrame { reflector_: Reflector::new(), + session: Dom::from_ref(session), + data, } } - pub fn new(global: &GlobalScope) -> DomRoot { + pub fn new( + global: &GlobalScope, + session: &XRSession, + data: WebVRFrameData, + ) -> DomRoot { reflect_dom_object( - Box::new(XRFrame::new_inherited()), + Box::new(XRFrame::new_inherited(session, data)), global, XRFrameBinding::Wrap, ) } } + +impl XRFrameMethods for XRFrame { + fn Session(&self) -> DomRoot { + DomRoot::from_ref(&self.session) + } + + fn GetViewerPose(&self, reference: Option<&XRReferenceSpace>) -> Option> { + // We assume the reference space is eye level for now + // since it's the only one 3DOF devices support + if reference.is_some() { + // it's not possible to obtain a reference + // space at all yet + return None; + } + let left = XRView::new(&self.global(), &self.session, XREye::Left, &self.data); + let right = XRView::new(&self.global(), &self.session, XREye::Right, &self.data); + Some(XRViewerPose::new(&self.global(), &left, &right)) + } +} -- cgit v1.2.3