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

Implement WebXR Gamepads Module (#32860)

Browse source 
* Expose gamepad attribute on XRInputSource

Signed-off-by: Daniel Adams <msub2official@gmail.com>

* Tidy, add spec links

Signed-off-by: Daniel Adams <msub2official@gmail.com>

* Update WPT test expectations

Signed-off-by: Daniel Adams <msub2official@gmail.com>

* Update gamepad state on InputChanged event

Signed-off-by: Daniel Adams <msub2official@gmail.com>

* Pin webxr commit

Signed-off-by: Daniel Adams <msub2official@gmail.com>

* Apply gamepad updates during frame updates

Signed-off-by: Daniel Adams <msub2official@gmail.com>

* Drain input frame map

Signed-off-by: Daniel Adams <msub2official@gmail.com>

* Don't store gamepad as option

Signed-off-by: Daniel Adams <msub2official@gmail.com>

---------

Signed-off-by: Daniel Adams <msub2official@gmail.com>
This commit is contained in:
Daniel Adams 2024-08-03 02:51:44 -10:00 • committed by GitHub
parent 0672eca749
commit fd83281657
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 90 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

47
components/script/dom/xrinputsource.rs
View file

@ -6,13 +6,15 @@ use dom_struct::dom_struct;
use js::conversions::ToJSValConvertible;
use js::jsapi::Heap;
use js::jsval::{JSVal, UndefinedValue};
use webxr_api::{Handedness, InputId, InputSource, TargetRayMode};
use script_traits::GamepadSupportedHapticEffects;
use webxr_api::{Handedness, InputFrame, InputId, InputSource, TargetRayMode};
use crate::dom::bindings::codegen::Bindings::XRInputSourceBinding::{
XRHandedness, XRInputSourceMethods, XRTargetRayMode,
};
use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom};
use crate::dom::gamepad::Gamepad;
use crate::dom::globalscope::GlobalScope;
use crate::dom::xrhand::XRHand;
use crate::dom::xrsession::XRSession;
@ -32,10 +34,28 @@ pub struct XRInputSource {
hand: MutNullableDom<XRHand>,
#[ignore_malloc_size_of = "mozjs"]
profiles: Heap<JSVal>,
gamepad: DomRoot<Gamepad>,
}
impl XRInputSource {
pub fn new_inherited(session: &XRSession, info: InputSource) -> XRInputSource {
pub fn new_inherited(
global: &GlobalScope,
session: &XRSession,
info: InputSource,
) -> XRInputSource {
// <https://www.w3.org/TR/webxr-gamepads-module-1/#gamepad-differences>
let gamepad = Gamepad::new(
global,
0,
"".into(),
"xr-standard".into(),
(-1.0, 1.0),
(0.0, 1.0),
GamepadSupportedHapticEffects {
supports_dual_rumble: false,
supports_trigger_rumble: false,
},
);
XRInputSource {
reflector: Reflector::new(),
session: Dom::from_ref(session),
@ -44,6 +64,7 @@ impl XRInputSource {
grip_space: Default::default(),
hand: Default::default(),
profiles: Heap::default(),
gamepad,
}
}
@ -54,7 +75,7 @@ impl XRInputSource {
info: InputSource,
) -> DomRoot<XRInputSource> {
let source = reflect_dom_object(
Box::new(XRInputSource::new_inherited(session, info)),
Box::new(XRInputSource::new_inherited(global, session, info)),
global,
);
@ -75,6 +96,21 @@ impl XRInputSource {
pub fn session(&self) -> &XRSession {
&self.session
}
pub fn update_gamepad_state(&self, frame: InputFrame) {
frame
.button_values
.iter()
.enumerate()
.for_each(|(i, value)| {
self.gamepad
.map_and_normalize_buttons(i as usize, *value as f64);
});
frame.axis_values.iter().enumerate().for_each(|(i, value)| {
self.gamepad
.map_and_normalize_axes(i as usize, *value as f64);
});
}
}
impl XRInputSourceMethods for XRInputSource {
@ -120,6 +156,11 @@ impl XRInputSourceMethods for XRInputSource {
self.profiles.get()
}
/// <https://www.w3.org/TR/webxr-gamepads-module-1/#xrinputsource-interface>
fn GetGamepad(&self) -> Option<DomRoot<Gamepad>> {
Some(DomRoot::from_ref(&*self.gamepad))
}
// https://github.com/immersive-web/webxr-hands-input/blob/master/explainer.md
fn GetHand(&self) -> Option<DomRoot<XRHand>> {
self.info.hand_support.as_ref().map(|hand| {