Skip to content
Permalink
Browse files

Auto merge of #24390 - Manishearth:grip-space, r=jdm

Support grip spaces in WebXR

Requires servo/webxr#67

Uses the support added in servo/webxr#67 to expose an optional grip space.

The per-frame click added there can't yet be consumed because we need to hook up gamepads (see #24389)

r? @asajeffrey @jdm

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24390)
<!-- Reviewable:end -->
  • Loading branch information...
bors-servo committed Oct 9, 2019
2 parents 5d9dba1 + 98d6d52 commit dd1c183a2b959dff73b43f5230dab03089802f01

Some generated files are not rendered by default. Learn more.

@@ -21,6 +21,6 @@ interface XRInputSource {
readonly attribute XRHandedness handedness;
// [SameObject] readonly attribute XRTargetRayMode targetRayMode;
[SameObject] readonly attribute XRSpace targetRaySpace;
// [SameObject] readonly attribute XRSpace? gripSpace;
[SameObject] readonly attribute XRSpace? gripSpace;
// [SameObject] readonly attribute Gamepad? gamepad;
};
@@ -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
}
}
}
@@ -19,6 +19,8 @@ pub struct XRSpace {
eventtarget: EventTarget,
session: Dom<XRSession>,
input_source: MutNullableDom<XRInputSource>,
/// If we're an input space, are we an aim space or a grip space?
is_grip_space: bool,
}

impl XRSpace {
@@ -27,24 +29,31 @@ impl XRSpace {
eventtarget: EventTarget::new_inherited(),
session: Dom::from_ref(session),
input_source: Default::default(),
is_grip_space: false,
}
}

fn new_inputspace_inner(session: &XRSession, input: &XRInputSource) -> XRSpace {
fn new_inputspace_inner(
session: &XRSession,
input: &XRInputSource,
is_grip_space: bool,
) -> XRSpace {
XRSpace {
eventtarget: EventTarget::new_inherited(),
session: Dom::from_ref(session),
input_source: MutNullableDom::new(Some(input)),
is_grip_space,
}
}

pub fn new_inputspace(
global: &GlobalScope,
session: &XRSession,
input: &XRInputSource,
is_grip_space: bool,
) -> DomRoot<XRSpace> {
reflect_dom_object(
Box::new(XRSpace::new_inputspace_inner(session, input)),
Box::new(XRSpace::new_inputspace_inner(session, input, is_grip_space)),
global,
XRSpaceBinding::Wrap,
)
@@ -72,7 +81,11 @@ impl XRSpace {
.iter()
.find(|i| i.id == id)
.expect("no input found");
frame.target_ray_origin.map(cast_transform)
if self.is_grip_space {
frame.grip_origin.map(cast_transform)
} else {
frame.target_ray_origin.map(cast_transform)
}
} else {
unreachable!()
}
@@ -125,9 +125,6 @@
[XRRay interface: existence and properties of interface prototype object]
expected: FAIL

[XRInputSource interface: attribute gripSpace]
expected: FAIL

[XRReferenceSpaceEvent interface: existence and properties of interface prototype object's "constructor" property]
expected: FAIL

0 comments on commit dd1c183

Please sign in to comment.
You can’t perform that action at this time.