diff options
author | Manish Goregaokar <manishsmail@gmail.com> | 2020-04-24 09:12:58 -0700 |
---|---|---|
committer | Manish Goregaokar <manishsmail@gmail.com> | 2020-04-27 17:35:48 -0700 |
commit | c89dc821ba8c5aa696024ac0fd41816ad5c3b68b (patch) | |
tree | 49890162c5eb23d790985a86c718fa38cee5805a /components/script/dom/xrinputsource.rs | |
parent | 6ad3e0c047051c3d3ec60839ef72c545e5aac873 (diff) | |
download | servo-c89dc821ba8c5aa696024ac0fd41816ad5c3b68b.tar.gz servo-c89dc821ba8c5aa696024ac0fd41816ad5c3b68b.zip |
Add XRHand interface
Diffstat (limited to 'components/script/dom/xrinputsource.rs')
-rw-r--r-- | components/script/dom/xrinputsource.rs | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/components/script/dom/xrinputsource.rs b/components/script/dom/xrinputsource.rs index ed8a3e6f1a5..bf9758f55a1 100644 --- a/components/script/dom/xrinputsource.rs +++ b/components/script/dom/xrinputsource.rs @@ -8,6 +8,7 @@ use crate::dom::bindings::codegen::Bindings::XRInputSourceBinding::{ use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector}; use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom}; use crate::dom::globalscope::GlobalScope; +use crate::dom::xrhand::XRHand; use crate::dom::xrsession::XRSession; use crate::dom::xrspace::XRSpace; use crate::realms::enter_realm; @@ -24,10 +25,9 @@ pub struct XRInputSource { session: Dom<XRSession>, #[ignore_malloc_size_of = "Defined in rust-webxr"] info: InputSource, - #[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>, + hand: MutNullableDom<XRHand>, #[ignore_malloc_size_of = "mozjs"] profiles: Heap<JSVal>, } @@ -40,6 +40,7 @@ impl XRInputSource { info, target_ray_space: Default::default(), grip_space: Default::default(), + hand: Default::default(), profiles: Heap::default(), } } @@ -112,4 +113,16 @@ impl XRInputSourceMethods for XRInputSource { fn Profiles(&self, _cx: JSContext) -> JSVal { self.profiles.get() } + + // https://github.com/immersive-web/webxr-hands-input/blob/master/explainer.md + fn GetHand(&self) -> Option<DomRoot<XRHand>> { + if let Some(ref hand) = self.info.hand_support { + Some( + self.hand + .or_init(|| XRHand::new(&self.global(), &self, hand.clone())), + ) + } else { + None + } + } } |