Support grip spaces in WebXR

This commit is contained in:
Manish Goregaokar 2019-10-07 17:20:14 -07:00
parent 0a745aaa44
commit c521d8ec01
3 changed files with 35 additions and 7 deletions

View file

@ -18,10 +18,12 @@ use webxr_api::{Handedness, InputId, InputSource};
pub struct XRInputSource {
reflector: Reflector,
session: Dom<XRSession>,
#[ignore_malloc_size_of = "Defined in rust-webvr"]
#[ignore_malloc_size_of = "Defined in rust-webxr"]
info: InputSource,
#[ignore_malloc_size_of = "Defined in rust-webvr"]
#[ignore_malloc_size_of = "Defined in rust-webxr"]
target_ray_space: MutNullableDom<XRSpace>,
#[ignore_malloc_size_of = "Defined in rust-webxr"]
grip_space: MutNullableDom<XRSpace>,
}
impl XRInputSource {
@ -31,6 +33,7 @@ impl XRInputSource {
session: Dom::from_ref(session),
info,
target_ray_space: Default::default(),
grip_space: Default::default(),
}
}
@ -65,7 +68,19 @@ impl XRInputSourceMethods for XRInputSource {
fn TargetRaySpace(&self) -> DomRoot<XRSpace> {
self.target_ray_space.or_init(|| {
let global = self.global();
XRSpace::new_inputspace(&global, &self.session, &self)
XRSpace::new_inputspace(&global, &self.session, &self, false)
})
}
/// https://immersive-web.github.io/webxr/#dom-xrinputsource-gripspace
fn GetGripSpace(&self) -> Option<DomRoot<XRSpace>> {
if self.info.supports_grip {
Some(self.target_ray_space.or_init(|| {
let global = self.global();
XRSpace::new_inputspace(&global, &self.session, &self, true)
}))
} else {
None
}
}
}